Version bump. EAPI 4, cmake based build, adding missing deps should fix bug #371817.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 39 insertions, 84 deletions

diff --git a/app-text/cb2bib/ChangeLog b/app-text/cb2bib/ChangeLog
index 728a7e147f42..5b16bfe3ba5a 100644
--- a/app-text/cb2bib/ChangeLog
+++ b/app-text/cb2bib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/cb2bib
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/cb2bib/ChangeLog,v 1.7 2011/09/13 18:59:52 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/cb2bib/ChangeLog,v 1.8 2012/01/19 13:30:58 johu Exp $
+
+*cb2bib-1.4.7 (19 Jan 2012)
+
+  19 Jan 2012; Johannes Huber <johu@gentoo.org> +cb2bib-1.4.7.ebuild,
+  -cb2bib-1.3.7.ebuild, -cb2bib-1.4.0.ebuild:
+  Version bump. EAPI 4, cmake based build, adding missing deps should fix bug
+  #371817.
 
   13 Sep 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #278944
diff --git a/app-text/cb2bib/cb2bib-1.4.0.ebuild b/app-text/cb2bib/cb2bib-1.4.0.ebuild
deleted file mode 100644
index 5e11774991af..000000000000
--- a/app-text/cb2bib/cb2bib-1.4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/cb2bib/cb2bib-1.4.0.ebuild,v 1.1 2010/04/29 06:21:51 ayoy Exp $
-
-EAPI="2"
-
-inherit qt4-r2
-
-DESCRIPTION="Tool for extracting unformatted bibliographic references"
-HOMEPAGE="http://www.molspaces.com/cb2bib/"
-SRC_URI="http://www.molspaces.com/dl/progs/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +lzo +poll"
-
-DEPEND="x11-libs/qt-webkit:4
-	lzo? ( dev-libs/lzo )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	echo "CONFIG += ordered" >> "${PN}.pro" || die "patching project file failed"
-	sed -i 's:\.\./COPYRIGHT \.\.\/LICENSE::' src/src.pro || die "sed src.pro failed"
-}
-
-src_configure() {
-	# Custom configure script has only few options, so call ./configure manually...
-	# We need to unset QTDIR here, else we may end up with qt3 if it is installed.
-	# TODO: remove QTDIR when qt3 goes away
-	QTDIR="" ./configure \
-		$(use_enable lzo) \
-		$(use_enable poll cbpoll) \
-		--disable-qmake-call \
-		--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"
-
-	eqmake4 $(cat qmake-additional-args)
-}
-
-pkg_postinst() {
-	elog "For best functionality, emerge the following packages:"
-	elog "    app-text/poppler-utils  - for data import from PDF files"
-	elog "    app-text/dvipdfm        - for data import from DVI files"
-	elog "    app-text/bibutils       - for data import from ISI, endnote format"
-	elog "    media-fonts/jsmath      - for displaying mathematical notation"
-	elog "    media-libs/exiftool     - for proper UTF-8 metadata writing in PDF"
-	elog "                              text strings"
-	elog "    virtual/latex-base      - to check for BibTeX file correctness and to get"
-	elog "                              nice printing through the shell script bib2pdf"
-}
diff --git a/app-text/cb2bib/cb2bib-1.3.7.ebuild b/app-text/cb2bib/cb2bib-1.4.7.ebuild
index 3f18b94af6dd..3868688e5137 100644
--- a/app-text/cb2bib/cb2bib-1.3.7.ebuild
+++ b/app-text/cb2bib/cb2bib-1.4.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/cb2bib/cb2bib-1.3.7.ebuild,v 1.1 2010/02/22 15:47:35 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/cb2bib/cb2bib-1.4.7.ebuild,v 1.1 2012/01/19 13:30:58 johu Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit qt4-r2
+inherit cmake-utils qt4-r2
 
 DESCRIPTION="Tool for extracting unformatted bibliographic references"
 HOMEPAGE="http://www.molspaces.com/cb2bib/"
@@ -15,32 +15,36 @@ LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +lzo +poll"
 
-DEPEND="x11-libs/qt-webkit:4
-	lzo? ( dev-libs/lzo )"
+DEPEND="
+	x11-libs/libX11
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-webkit:4
+	lzo? ( dev-libs/lzo )
+"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	echo "CONFIG += ordered" >> "${PN}.pro" || die "patching project file failed"
-	sed -i 's:\.\./COPYRIGHT \.\.\/LICENSE::' src/src.pro || die "sed src.pro failed"
+src_configure() {
+	if use !lzo; then
+		mycmakeargs+=( -DC2B_USE_LZO=OFF )
+	fi
+
+	if use !poll; then
+		mycmakeargs+=( -DC2B_USE_POLL=OFF )
+	fi
+
+	cmake-utils_src_configure
 }
 
-src_configure() {
-	# Custom configure script has only few options, so call ./configure manually...
-	# We need to unset QTDIR here, else we may end up with qt3 if it is installed.
-	# TODO: remove QTDIR when qt3 goes away
-	QTDIR="" ./configure \
-		$(use_enable lzo) \
-		$(use_enable poll cbpoll) \
-		--disable-qmake-call \
-		--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"
-
-	eqmake4 $(cat qmake-additional-args)
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	rm "${D}"/usr/share/${PN}/COPYRIGHT || die "rm COPYRIGHT failed"
+	rm "${D}"/usr/share/${PN}/LICENSE || die "rm LICENSE failed"
 }
 
 pkg_postinst() {