Version bump and remove old. Apply temporary patch for bug #349979 by Till Matthiesen and use cmake build system.

Package-Manager: portage-2.2.0_alpha15/cvs/Linux x86_64

5 files changed, 91 insertions, 43 deletions

diff --git a/app-text/apvlv/ChangeLog b/app-text/apvlv/ChangeLog
index e4dc2d1ab330..1eb0b6c9ca38 100644
--- a/app-text/apvlv/ChangeLog
+++ b/app-text/apvlv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/apvlv
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/apvlv/ChangeLog,v 1.8 2010/12/04 10:35:49 phajdan.jr Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/apvlv/ChangeLog,v 1.9 2011/01/17 23:47:21 radhermit Exp $
+
+*apvlv-0.1.0 (17 Jan 2011)
+
+  17 Jan 2011; Tim Harder <radhermit@gentoo.org> -apvlv-0.0.9.4.ebuild,
+  +apvlv-0.1.0.ebuild, +files/apvlv-0.1.0-poppler-0.16.patch:
+  Version bump and remove old. Apply temporary patch for bug #349979 by Till
+  Matthiesen and use cmake build system.
 
   04 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> apvlv-0.0.9.8.ebuild:
   x86 stable wrt bug #347115
diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest
index 29ed962d6d52..4f970b1cf8af 100644
--- a/app-text/apvlv/Manifest
+++ b/app-text/apvlv/Manifest
@@ -1,6 +1,21 @@
-DIST apvlv-0.0.9.4.tar.gz 214345 RMD160 a81748ffb0148ef1d0066ef14321e77663e2f69f SHA1 cf413c9f996079e9b94db325e8bcd8cdd0a8b7a7 SHA256 e2e4007fb3d52712a733758bf6ef1459bc27f128c7e8a7cb7a1f6985e4365c1e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX apvlv-0.1.0-poppler-0.16.patch 433 RMD160 e6142232a6c2065bc43317f077002a72e8e974b8 SHA1 6f9845596c690e12df14916d57deac1a4057e25a SHA256 c7065f3a123378cb0bf574ef8bbfe2c5b894ddb7380933c23e39653c81bd3b17
 DIST apvlv-0.0.9.8.tar.gz 219536 RMD160 eb47a63b668fc0e8010ffe07d977cf137a208ae5 SHA1 23135983db75cadb0f6c7093b13bea6dbc2d480f SHA256 adb2ac18e3e75c51b2a5e378d67837b0c15b87e1e3aad05f3501565c4671f902
-EBUILD apvlv-0.0.9.4.ebuild 995 RMD160 b693a2c4f89d70e8646f088b0945b4cd08b9e519 SHA1 45c740feec16ea8500c3330bff40ebee97aa2c62 SHA256 6750d88bb76105d1ed1e7854f738454a322caa2bad0a0bcc92cc79bbb15e319e
+DIST apvlv-0.1.0-Source.tar.gz 1172478 RMD160 8e8501126e40aec2899a7a1c452f795314d2a146 SHA1 9f7f717fc2c9da2c021d3bd2951220095f1e29c2 SHA256 9b16ebe46afacd12828a468d36561b1385e0564b116dba40c168d26f35e1ed18
 EBUILD apvlv-0.0.9.8.ebuild 1000 RMD160 2ac184dd29735835fa2164a038231dc98ac28b0a SHA1 49cdcd156b59ec57e1ffd007edc00d09442af6ae SHA256 492d2f6f4aac49257cba79fe6ac099fa590cae3b7a250b2fe4699668f24a05b2
-MISC ChangeLog 1434 RMD160 1ee6311c4af2e1dc959c34eeff591ddeb3e43cf1 SHA1 03c5e2ee434a96baf7f710bc84ef101a4b3ba1b9 SHA256 454cb47114d9e042dde5163f8366aba18dd63eed3b2fabcfcd59a936f1db140a
+EBUILD apvlv-0.1.0.ebuild 1296 RMD160 ea3cdcfa32131cd652a39135448de57107c01b15 SHA1 95c34b6035a598e8d9f5ffa022a41faf469e8efc SHA256 06daf68d405cdd728dceb069e7a7496b6599ca2a673467a8232827daf6bba949
+MISC ChangeLog 1714 RMD160 bbe008250ab6b0d3583a354b7482bb57367e794e SHA1 01a0ed4d1d710ba8054351295b9f8445c57b673a SHA256 51afaad30e9a91da7301a7084699e1ab5eb51971068a6e8620ae9b45d24f7532
 MISC metadata.xml 261 RMD160 7cd1ddfd358cc2c32cdbef2a91bc0dfd4874be76 SHA1 b0eaff8b16efedc8a719b6cf2a80ad04e63842d6 SHA256 4d3ce70054c33e50e05612f1258f7c947621fcaa3985ae1f59e828cd4f3c0c28
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNNNUVAAoJEEqz6FtPBkyjyxcH/iuEhG8Odk5xUqqDEL4+YiXE
+CvMkFbXB1WSbDhVAbibzbjKae76PytzrV1Hh1JxVJSUZduBQI10Z+3JcpBVGL0Hq
+Op/e1jZ6OhgQWndLT2S/eztjvuxuPewDS3uXD4LkXcpKxRUQkwH/fAtDJKa4bBqn
+ZgTvmCddtzSuuXtK7cULedf9qVtwHq64GIvvET5WtuDUqR69dtxLV+BoEhZnP+hI
+Oljfx4dK8bGYnElF+Ap1yuVZZQqPIHQM0UuegqL9CNy1p7VaMhPQ+9PUSNiA9eCX
++usBHlbylDZHhU+a0m1cyvs57Zf+5OegcCWEbQ9VhsIOz0/9B7vNeD+2cJHgeUs=
+=9yCq
+-----END PGP SIGNATURE-----
diff --git a/app-text/apvlv/apvlv-0.0.9.4.ebuild b/app-text/apvlv/apvlv-0.0.9.4.ebuild
deleted file mode 100644
index 6b5bf4a7bc69..000000000000
--- a/app-text/apvlv/apvlv-0.0.9.4.ebuild
+++ /dev/null
@@ -1,38 +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/apvlv/apvlv-0.0.9.4.ebuild,v 1.3 2010/05/25 21:10:11 pacho Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Alf's PDF Viewer Like Vim"
-HOMEPAGE="http://code.google.com/p/apvlv/"
-SRC_URI="http://apvlv.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug djvu"
-
-RDEPEND=">=x11-libs/gtk+-2.4:2
-	>=app-text/poppler-0.12.3-r3[cairo]
-	djvu? ( app-text/djvu )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		--disable-dependency-tracking \
-		--with-sysconfdir=/etc/${PN} \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-mandir=/usr/share/man \
-		$(use_with djvu)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README THANKS TODO
-	newicon icons/pdf.png ${PN}.png
-	make_desktop_entry ${PN} "Alf's PDF Viewer Like Vim" ${PN} "Office;Viewer"
-}
diff --git a/app-text/apvlv/apvlv-0.1.0.ebuild b/app-text/apvlv/apvlv-0.1.0.ebuild
new file mode 100644
index 000000000000..24ef93cf7044
--- /dev/null
+++ b/app-text/apvlv/apvlv-0.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/apvlv/apvlv-0.1.0.ebuild,v 1.1 2011/01/17 23:47:21 radhermit Exp $
+
+EAPI=3
+
+inherit eutils cmake-utils
+
+MY_P="${P}-Source"
+DESCRIPTION="Alf's PDF Viewer Like Vim"
+HOMEPAGE="http://code.google.com/p/apvlv/"
+SRC_URI="http://apvlv.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug djvu"
+
+RDEPEND=">=x11-libs/gtk+-2.10.4:2
+	>=app-text/poppler-0.12.3-r3[cairo]
+	djvu? ( app-text/djvu )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# bug #349979
+	has_version ">=app-text/poppler-0.15.0" && epatch "${FILESDIR}"/${P}-poppler-0.16.patch
+
+	# Remove prefixes so it works with the cmake-utils eclass
+	sed -i -e "s:APVLV_::" src/CMakeLists.txt
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DSYSCONFDIR=/etc/${PN}
+		-DDOCDIR=/usr/share/doc/${PF}
+		-DMANDIR=/usr/share/man
+		-DWITH_UMD=OFF
+		$(cmake-utils_use_enable debug)
+		$(cmake-utils_use_with djvu)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS NEWS README THANKS TODO
+	newicon icons/pdf.png ${PN}.png
+	make_desktop_entry ${PN} "Alf's PDF Viewer Like Vim" ${PN} "Office;Viewer"
+}
diff --git a/app-text/apvlv/files/apvlv-0.1.0-poppler-0.16.patch b/app-text/apvlv/files/apvlv-0.1.0-poppler-0.16.patch
new file mode 100644
index 000000000000..3c7df684b3fa
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.1.0-poppler-0.16.patch
@@ -0,0 +1,11 @@
+--- apvlv-0.1.0-Source/src/ApvlvFile.cpp.orig
++++ apvlv-0.1.0-Source/src/ApvlvFile.cpp
+@@ -285,7 +285,7 @@
+   {
+     PopplerRectangle rect = { x1, y1, x2, y2 };
+     PopplerPage *page = poppler_document_get_page (mDoc, pn);
+-    *out = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect);
++    *out = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect);
+     if (*out != NULL)
+       {
+         return true;