# ChangeLog for app-text/cb2bib
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 06 Jan 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
+ -cb2bib-1.3.5.ebuild, -files/cb2bib-1.3.5-disable-cbpoll.patch,
+ -files/cb2bib-1.3.5-noqmake.patch, +cb2bib-1.3.6.ebuild:
+ Version bump, making possible some simplifications in the ebuild and
+ obsoleting the patches.
+
10 Dec 2009; Markos Chandras <hwoarang@gentoo.org> cb2bib-1.3.5.ebuild:
Update qt-webkit version, add debug use dependency
-AUX cb2bib-1.3.5-disable-cbpoll.patch 2118 RMD160 bf00d7fa87e0f7d7944e1f8ae2391b64c1c9d390 SHA1 b13be5b44c0001533f00b6ac885048803c5c666c SHA256 9f7cb7b9ae7f95411986bdac3e471d4a2931b4a7c391e1ec5f02a369408a1f0c
-AUX cb2bib-1.3.5-noqmake.patch 1551 RMD160 789b28adcbe5221a92f45ad1451eb813c845a92a SHA1 00b2e4970c7a50474386bbc6480e8059cda167b5 SHA256 a97ce58d9c0428baefef168988d0975167578d6aaa984a82aef24d3a703e827f
-DIST cb2bib-1.3.5.tar.gz 605607 RMD160 c63170b754b99ce088403543ee6a4755f59cbc86 SHA1 208de22120885aff9c5b800484fb1669d7bb12be SHA256 59d6d713f5561c06b9916a196ee2377792dd23f9dcd8b65d85368325b039eb74
-EBUILD cb2bib-1.3.5.ebuild 2319 RMD160 2dfa9a60d4451fce13f2b302914356f5c5534cc2 SHA1 7a6ae00dbef94b22b29b082bdbb62c41afbb76d8 SHA256 c5fe27d0d8962175ecfcfbaf6c6612c2ed840d02caaab675402fcb8d376de4d2
-MISC ChangeLog 610 RMD160 2671c17433a1593b70d3274896e5234eaec27867 SHA1 036537913ee3ad4e799f43c8bb24aa2a5306fcda SHA256 8b3cbe6586a89fe3d96d741b35f0aeba86a2bbcdff2ba08e88a28ad39039a6fd
+DIST cb2bib-1.3.6.tar.gz 607257 RMD160 1f8adfeb43aefd04256d0f329f96433fb2888d07 SHA1 384ace2cf33363d4548e3ba345122b478a553f75 SHA256 b6ebf499fbe8f3e661b55c19b3b8463044f0795f1265d8c8c1bbe6e9fbc332ad
+EBUILD cb2bib-1.3.6.ebuild 2087 RMD160 a0072bcad9d4f2c9ab9bcb99375b3627a0fb6bc1 SHA1 56f9ad624ce5df3d07be358c1960a61604392a6c SHA256 db89fd95ba9a9e06965ec2d6f9194bc5b7fc1b2bb4064eefef2bf46d62aeeadb
+MISC ChangeLog 899 RMD160 60e59b47b7173b6955cc581ece1f1af1ca781a50 SHA1 7faf63cc869ee1badd05a6dc463646cc960edd04 SHA256 e0af9ef43c12125d1586d355a4d71d8e6bbe7b860e8bf470c498a12d76db8ba2
MISC metadata.xml 351 RMD160 8792583cb28727b092e491a56ce67dc5095dacd6 SHA1 568dec7949154c83a72054209b0e55f43f434fdf SHA256 6fd09a630bdf714423512d8ef70b51b08901cfd28b2b5a3f6c45776cc071d138
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
-inherit qt4
+inherit qt4-r2
DESCRIPTION="Tool for extracting unformatted bibliographic references"
HOMEPAGE="http://www.molspaces.com/cb2bib/"
lzo? ( dev-libs/lzo )"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}"-{disable-cbpoll,noqmake}.patch )
+src_prepare() {
+ # we need to make these two scripts executable before running qmake
+ # then qmake picks that up and installs them with $(INSTALL_PROGRAM),
+ # i.e. executable. :]
+ #
+ chmod +x c2bscripts/c2bimport || die
+ chmod +x c2bscripts/c2bciter || die
+}
src_configure() {
- # The non-standard configure script has only few options, not a matching
- # --enable for every --disable, and uses _ instead of - as separator...
- # So do things manually...
# We need to unset QTDIR here, else we may end up with qt3 if it is installed.
QTDIR="" ./configure \
- $(use lzo || echo --disable_lzo) \
- $(use poll || echo --disable_cbpoll) \
+ $(use_enable lzo) \
+ $(use_enable poll cbpoll) \
--qmakepath /usr/bin/qmake \
--prefix /usr \
--bindir /usr/bin \
--datadir /usr/share \
--desktopdatadir /usr/share/applications \
- --icondir /usr/share/pixmaps || die "cb2bib provided configure failed"
+ --icondir /usr/share/pixmaps \
+ --disable-qmake-call || die "cb2bib provided configure failed"
- # configure is patched not to run qmake itself but just write the commandline
- # parameters into a file "qmake-additional-args"
+ # configure writes the additional qmake commandline parameters into a
+ # file "qmake-additional-args"
eqmake4 ${PN}.pro $(cat qmake-additional-args)
}
src_install() {
emake INSTALL_ROOT="${D}" install || die "emake install failed"
-
- # qmake or src.pro defect: scripts are installed by $(INSTALL_FILE)
- # instead of $(INSTALL_PROGRAM), and thus the executable bit becomes
- # cleared
- fperms +x "/usr/bin/c2bimport" || die
- fperms +x "/usr/bin/c2bciter" || die
}
pkg_postinst() {
+++ /dev/null
-This patch fixes the --disable_poll configure switch. A stray temporary
-file named "tmp.pro" residing in toplevel build directory confused qmake.
-Now use sed -i to avoid going through temporaries.
-
---- a/configure 2009-12-07 18:13:08.000000000 +0100
-+++ b/configure 2009-12-07 18:19:42.000000000 +0100
-@@ -240,23 +240,22 @@
- #- Setting dirs and start qmake -----------------------------------------------
-
- echo
--sed 's%^.*cb2bibdata.path .*$%cb2bibdata.path = '$f_datadir'%g' src/src.pro > tmp.pro
--sed 's%^.*target.path .*$%target.path = '$f_bindir'%g' tmp.pro > src/src.pro
--sed 's%^.*script.path .*$%script.path = '$f_bindir'%g' src/src.pro > tmp.pro
--sed 's%^.*desktop.path .*$%desktop.path = '$f_desktopdatadir'%g' tmp.pro > src/src.pro
--sed 's%^.*icons.path .*$%icons.path = '$f_icondir'%g' src/src.pro > tmp.pro
--mv -f tmp.pro src/src.pro
-+sed -i -e 's%^.*cb2bibdata\.path .*$%cb2bibdata.path = '$f_datadir'%g' \
-+ -e 's%^.*target\.path .*$%target.path = '$f_bindir'%g' \
-+ -e 's%^.*script\.path .*$%script.path = '$f_bindir'%g' \
-+ -e 's%^.*desktop\.path .*$%desktop.path = '$f_desktopdatadir'%g' \
-+ -e 's%^.*icons\.path .*$%icons.path = '$f_icondir'%g' src/src.pro
-+
- if test "$f_disable_cbpoll" = y; then
-- echo "Setting clipboardPoll disabled"
-- sed 's% disable_cbpoll%%g' src/src.pro > tmp.pro
-- sed 's%^CONFIG.*= %CONFIG += disable_cbpoll %g' tmp.pro > src/src.pro
-+ echo "Setting clipboardPoll disabled"
-+ sed -i -e 's% disable_cbpoll%%g' \
-+ -e 's%^CONFIG.*= %CONFIG += disable_cbpoll %g' src/src.pro
- else
-- echo "Setting clipboardPoll enabled (Unix/Linux only)"
-- sed 's% disable_cbpoll%%g' src/src.pro > tmp.pro
-- mv -f tmp.pro src/src.pro
-+ echo "Setting clipboardPoll enabled (Unix/Linux only)"
-+ sed -i 's% disable_cbpoll%%g' src/src.pro
- fi
--sed 's%^const QString C2B_DATA_DIR.*$%const QString C2B_DATA_DIR("'$f_datadir'/");%g' src/c2b/cb2bib_parameters.h > tmp.par
--mv -f tmp.par src/c2b/cb2bib_parameters.h
-+sed -i 's%^const QString C2B_DATA_DIR.*$%const QString C2B_DATA_DIR("'$f_datadir'/");%g' \
-+ src/c2b/cb2bib_parameters.h
-
- f_configs=
- if test "$f_disable_lzo" = y; then
+++ /dev/null
-diff -r -u cb2bib-1.3.5.orig/configure cb2bib-1.3.5/configure
---- cb2bib-1.3.5.orig/configure 2009-10-26 17:50:04.000000000 +0100
-+++ cb2bib-1.3.5/configure 2009-12-06 00:25:02.000000000 +0100
-@@ -264,29 +264,5 @@
- f_configs="-config disable_lzo"
- fi
-
--if test "$platform" = Darwin; then
--echo "Running $f_qmake -spec macx-g++ $f_configs -o Makefile"
--"$f_qmake" -spec macx-g++ $f_configs -o Makefile
--else
--echo "Running $f_qmake $f_configs -o Makefile"
--"$f_qmake" $f_configs -o Makefile
--fi
-+echo $f_configs > qmake-additional-args
-
--echo " "
--if test "$f_make" = NO; then
-- echo "Configuration ended. 'make' not found."
-- echo "Build toolchain might not be completed."
--else
-- echo "-----------------------------------------------------------------------"
-- echo "Configuration ended. Type 'make' and 'make install'."
-- echo "-----------------------------------------------------------------------"
-- echo "- NOTE: 'make install' will copy the required runtime files to the"
-- echo " specified locations. Besides cb2bib binary, 'make install' will copy"
-- echo " the scripts c2bimport and c2bciter, and will set their executable"
-- echo " permissions. Also, it will set cb2bib, c2bimport, and c2bciter"
-- echo " desktop files."
-- echo "-----------------------------------------------------------------------"
-- echo "- NOTE: cb2Bib requires lzo library. If it were unavailable in your"
-- echo " platform, reconfigure using --disable_lzo."
-- echo "-----------------------------------------------------------------------"
--fi
projects / ~andy / sunrise / commitdiff