Disable the qt4 password test; it depends on a pdf that cannot be distributed. Bug #201448

Package-Manager: portage-2.1.5_rc2

6 files changed, 53 insertions, 6 deletions

diff --git a/app-text/poppler-bindings/ChangeLog b/app-text/poppler-bindings/ChangeLog
index 2d5f41f8442b..f8abd37f2c3c 100644
--- a/app-text/poppler-bindings/ChangeLog
+++ b/app-text/poppler-bindings/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/poppler-bindings
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.84 2008/04/10 19:05:45 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.85 2008/04/11 00:20:52 dang Exp $
+
+  11 Apr 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +files/poppler-0.6.3-no-password-test.patch,
+  +files/poppler-0.8.0-no-password-test.patch,
+  poppler-bindings-0.6.3.ebuild, poppler-bindings-0.8.0.ebuild:
+  Disable the qt4 password test; it depends on a pdf that cannot be
+  distributed. Bug #201448
 
   10 Apr 2008; Timo Gurr <tgurr@gentoo.org> poppler-bindings-0.5.3.ebuild,
   poppler-bindings-0.8.0.ebuild:
diff --git a/app-text/poppler-bindings/Manifest b/app-text/poppler-bindings/Manifest
index 312d5768683b..48bf3026fac1 100644
--- a/app-text/poppler-bindings/Manifest
+++ b/app-text/poppler-bindings/Manifest
@@ -1,6 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX glib-2.0.fix 3794 RMD160 ec38bc7db6896db2d124706201ce1169e2900605 SHA1 54f0487411487e2039e75e8ce62b8746617af26a SHA256 6ce30931b31eb49095a1420b6fc1a15e02a726e1ec7b490460587939bbef9e16
 AUX poppler-0.5.2-bindings.patch 2981 RMD160 3cd602de04e21b16ad2d72e43ac497f2096e9407 SHA1 5fada87381a777eed18bf2db8c2f74c66769f2db SHA256 fddf8730871743ca6bb3cf210f9444b7b5de4704d68b383ddc982ef9e2ff9ffc
 AUX poppler-0.6-bindings.patch 4980 RMD160 8e2953d6dd3612d1fa5aaedd373bf0b1b90043c4 SHA1 9525ef7dffdf993035d8a33a3851e1dbca200dad SHA256 03ee71d16535b8c58acec513401435af12a6179e4e0d0b7e11b700b80ceff7f6
+AUX poppler-0.6.3-no-password-test.patch 468 RMD160 82cdd62600ade024af1cbc644ff58e1abc8f6e5d SHA1 c0641f0019c772e3ae29c5bc2d0ac6d68fead66a SHA256 7fc98f2647d3188679da9f9ecb43e8f5693301e6e62ea955040e647cd1a75b70
+AUX poppler-0.8.0-no-password-test.patch 451 RMD160 02a4339d1744ca9875a56315820afe32eb8c09af SHA1 8aeffdcd93c5b4583cf6161ace3c1c37127de750 SHA256 03a7d35a7ef2db94336a129dc68c7065c3e657362fd1523258a19e53d82e5a99
 AUX poppler-nocairo.patch 4770 RMD160 6daf746989f04bd5f5d3bb0c48994ca9fa807310 SHA1 d8eaf90e5bab5a2bb5990ffbdf2940da8c4ab0fd SHA256 a83b4602e877a07f3d83410068208886ed3e90ba0fa044548bee6af48948fe5e
 DIST poppler-0.5.3.tar.gz 1049900 RMD160 3456de23955fc4001842c76d32deba308bd7f968 SHA1 e197f5cf56f0676b5ca313577dd6456a393c46ec SHA256 5cfabff39670610fa8f5c33da7b9b0ae89d445445be6d6c245cdce8bf3f24190
 DIST poppler-0.5.4.tar.gz 1062401 RMD160 f28c89b03388757067505df3c60a1d878626b0dd SHA1 edf4e4ff17ef86a7f60f097949ad7db53fa2c3b1 SHA256 ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9
@@ -15,8 +20,15 @@ EBUILD poppler-bindings-0.5.3.ebuild 1805 RMD160 f8f46960d74d33f79da567b2266ed75
 EBUILD poppler-bindings-0.5.4.ebuild 1814 RMD160 075c8e04d914681ca9702c2286f8393a046a6767 SHA1 e9413236a2906c42c60500a31ebda6cecd54e401 SHA256 9d2fe71e7cddfe0a5276ad0234c8b706dfd27ed6f97fe05af39c0ea4e8b72301
 EBUILD poppler-bindings-0.6.1.ebuild 2014 RMD160 91a9021da21d17a5b5edf6867e664eb7dd3da7d8 SHA1 e1b572a82d9a90abb8a5bf2e5201da53db934069 SHA256 c3b35165e90d731c5bf9077ed372c1e587711596245e645ab71635212a315db5
 EBUILD poppler-bindings-0.6.2.ebuild 2024 RMD160 c3678cdf6bf711bff4bf9d1df2c25620bc89df6e SHA1 0d25b2eacffb058b3fdcd45642e10682f1f31e9e SHA256 213838855688307cde71723ddfdf6e32d219b4d581e9a03006a1c77f705e580b
-EBUILD poppler-bindings-0.6.3.ebuild 2005 RMD160 ef4434d12cdecba6637fe3237b40214067a6e80c SHA1 cdb238224738f79561abb5f965314d96be51500e SHA256 1de70f6bbb9dfcf844006b5018e685230193384795baefbebbba78081eb47c05
+EBUILD poppler-bindings-0.6.3.ebuild 2128 RMD160 7e5849df5cdbc88a98211e5f89724004d02afa53 SHA1 a8b2feb4cde98366253b1d0126bf71f0f4b51343 SHA256 dd8e93225d497647e4b025689278b7a3629bfc5c4cf876774b428f1165d6db3f
 EBUILD poppler-bindings-0.6.ebuild 1775 RMD160 cd31f4d692a7c5002a67d0816ec01f010238a745 SHA1 15ec89f6309b8df55098bafddc08442912e85b52 SHA256 289a2520b65428f4e87ece068cedcabe024b30ea0e76fd523ea6b6176f927725
-EBUILD poppler-bindings-0.8.0.ebuild 2133 RMD160 c8cdec86b1c5cb85e369d16d634fa8fabcc357f2 SHA1 5cf35b9096945d33daadb54bfe51b3fe457dcdf3 SHA256 57e803c553a02dc1170b141186bf0f3e4535b29eae37ec85c15e7365923eaab1
-MISC ChangeLog 12762 RMD160 472581323cf4530461ca0cf3a384096580cb43ac SHA1 e1db9d9e46d56b09ea4fd667382dada326eafbf8 SHA256 ecc3ec173213d79b69ad04e233cf8a6a7dcce25e9305c3b5a77315ba19b7955e
+EBUILD poppler-bindings-0.8.0.ebuild 2260 RMD160 87d4e69611a9a90a1aff94f34f5e7e982b6a65e0 SHA1 b1513209e144a1b2c49a23a9a251c286e2c51d96 SHA256 0d5e7b07aa5cb6737fdd8d4f3396c6d077e3b3544bb641a4c800a6ddfa202b69
+MISC ChangeLog 13066 RMD160 456f6fc55fd83cba2069530c918e0af2c19b43d4 SHA1 716717b980a55eeb79da487ea896c40bd498dab6 SHA256 e90703d6da83b76fc4de5737880857838f926343fbf9e8bd996beeb1dc4fb800
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iD8DBQFH/q6pomPajV0RnrERAodwAJ0TJc5WVQOLoFWB3PTJZAMV4oo5WACffdwM
+MJJa6OYyYV7V+Fg8I8PSVV8=
+=Xa0V
+-----END PGP SIGNATURE-----
diff --git a/app-text/poppler-bindings/files/poppler-0.6.3-no-password-test.patch b/app-text/poppler-bindings/files/poppler-0.6.3-no-password-test.patch
new file mode 100644
index 000000000000..e6e2590ab29b
--- /dev/null
+++ b/app-text/poppler-bindings/files/poppler-0.6.3-no-password-test.patch
@@ -0,0 +1,11 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN poppler-0.6.3.orig/qt4/tests/Makefile.am poppler-0.6.3/qt4/tests/Makefile.am
+--- poppler-0.6.3.orig/qt4/tests/Makefile.am	2007-11-04 18:11:23.000000000 -0500
++++ poppler-0.6.3/qt4/tests/Makefile.am	2008-04-10 19:57:38.000000000 -0400
+@@ -63,7 +63,6 @@ TESTS = \
+ 	check_metadata         	\
+ 	check_permissions      	\
+ 	check_pagemode    	\
+-	check_password    	\
+ 	check_pagelayout
+ 
+ check_PROGRAMS = $(TESTS)
diff --git a/app-text/poppler-bindings/files/poppler-0.8.0-no-password-test.patch b/app-text/poppler-bindings/files/poppler-0.8.0-no-password-test.patch
new file mode 100644
index 000000000000..8a46fee7f572
--- /dev/null
+++ b/app-text/poppler-bindings/files/poppler-0.8.0-no-password-test.patch
@@ -0,0 +1,11 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN poppler-0.8.0.orig/qt4/tests/Makefile.am poppler-0.8.0/qt4/tests/Makefile.am
+--- poppler-0.8.0.orig/qt4/tests/Makefile.am	2008-03-22 14:11:44.000000000 -0400
++++ poppler-0.8.0/qt4/tests/Makefile.am	2008-04-10 20:08:33.000000000 -0400
+@@ -67,7 +67,6 @@ TESTS = \
+ 	check_optcontent	\
+ 	check_permissions      	\
+ 	check_pagemode    	\
+-	check_password    	\
+ 	check_pagelayout	\
+ 	check_search
+ 
diff --git a/app-text/poppler-bindings/poppler-bindings-0.6.3.ebuild b/app-text/poppler-bindings/poppler-bindings-0.6.3.ebuild
index 5b5461cb3abc..fb0904f77a6a 100644
--- a/app-text/poppler-bindings/poppler-bindings-0.6.3.ebuild
+++ b/app-text/poppler-bindings/poppler-bindings-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.6.3.ebuild,v 1.2 2008/03/01 04:54:28 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.6.3.ebuild,v 1.3 2008/04/11 00:20:52 dang Exp $
 
 inherit autotools eutils multilib
 
@@ -42,6 +42,9 @@ src_unpack(){
 
 	epatch "${FILESDIR}"/poppler-0.6-bindings.patch
 
+	# Don't run password test; the test file is not there. Bug #201448
+	epatch "${FILESDIR}"/poppler-0.6.3-no-password-test.patch
+
 	AT_M4DIR="m4" eautoreconf
 }
 
diff --git a/app-text/poppler-bindings/poppler-bindings-0.8.0.ebuild b/app-text/poppler-bindings/poppler-bindings-0.8.0.ebuild
index 19bd500f4b5e..eec9b8bf8936 100644
--- a/app-text/poppler-bindings/poppler-bindings-0.8.0.ebuild
+++ b/app-text/poppler-bindings/poppler-bindings-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.8.0.ebuild,v 1.2 2008/04/10 19:05:45 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.8.0.ebuild,v 1.3 2008/04/11 00:20:52 dang Exp $
 
 EAPI="1"
 inherit autotools eutils multilib
@@ -46,6 +46,9 @@ src_unpack(){
 
 	epatch "${FILESDIR}"/poppler-0.6-bindings.patch
 
+	# Don't run password test; the test file is not there. Bug #201448
+	epatch "${FILESDIR}"/poppler-0.8.0-no-password-test.patch
+
 	AT_M4DIR="m4" eautoreconf
 	cd poppler
 	ln -s /usr/lib/libpoppler.la