Use type -P instead of which. Fixes bug #174176.

Package-Manager: portage-2.1.2.3

diff --git a/app-text/pdftk/ChangeLog b/app-text/pdftk/ChangeLog
index 39348b0a171efb878443fdfe2bc6ba3f8443f13a..556b23b6af91b0b48c91687fdae4ea9451f38fdb 100644 (file)
--- a/app-text/pdftk/ChangeLog
+++ b/app-text/pdftk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/pdftk
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/ChangeLog,v 1.22 2007/04/17 23:12:53 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/ChangeLog,v 1.23 2007/04/17 23:16:01 betelgeuse Exp $
+
+  17 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> pdftk-1.12.ebuild:
+  Use type -P instead of which. Fixes bug #174176.
 
   17 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> metadata.xml,
   pdftk-1.12.ebuild:

diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 3c58168c491123a9ffdcc27505c04d944071cafc..973b87162fe24807fc8a1035ffeeeabab65cf9b4 100644 (file)
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -7,14 +7,14 @@ RMD160 1bb66deef9aa157bb1a8fb51e5851ef164128f42 files/pdftk-1.12-user-pw.patch 8
 SHA256 9cdfc3adce420b4a4940444926ed03988425f16cdf0cbcf2ca1264440f7ae2d9 files/pdftk-1.12-user-pw.patch 827
 DIST pdftk-1.12.tar.gz 779882 RMD160 adc4e2c99414c4ebc26bed65a7e4a5c8ddae290c SHA1 b4d54302cf3d53c137acb5b995b03c4f7dab7f41 SHA256 682811d4f54fd87fdf793cdcbe017ee723a176be2bade26d051f84a2d7501d12
 DIST pdftk_1.12-11.diff.gz 8732 RMD160 de0e53c6e8907e1198691eed106590d21e57a3dd SHA1 4ed0feb198657cef9ad07349e8d63733204f688a SHA256 dd480456af7c48ff3a958bc13f91fd421250b87e3b7dacbc95d7200c7aa54c08
-EBUILD pdftk-1.12.ebuild 1383 RMD160 fd5829ca525d3d63d1c9e7c7568d6e89fd519859 SHA1 37fbaf9d575c34747fe859775a77c5d9285a7c49 SHA256 2e7a885fb32c15bb4b242430edca1c5d9a5830a040b1cf4f42ce9f1396ffcbe9
-MD5 9586c0e56642421e703a256d9ccea0fb pdftk-1.12.ebuild 1383
-RMD160 fd5829ca525d3d63d1c9e7c7568d6e89fd519859 pdftk-1.12.ebuild 1383
-SHA256 2e7a885fb32c15bb4b242430edca1c5d9a5830a040b1cf4f42ce9f1396ffcbe9 pdftk-1.12.ebuild 1383
-MISC ChangeLog 3088 RMD160 1428f3960d51ea61c6a879b3da93284e8ce57292 SHA1 68f1437bd83e2122a9ccc898ba25264a313c0e27 SHA256 8a52aac40b802d976c31771f317a376dc73fda2d26035b257a387ee3113de726
-MD5 bc2070b61c97e48e8bf68a99639ecb58 ChangeLog 3088
-RMD160 1428f3960d51ea61c6a879b3da93284e8ce57292 ChangeLog 3088
-SHA256 8a52aac40b802d976c31771f317a376dc73fda2d26035b257a387ee3113de726 ChangeLog 3088
+EBUILD pdftk-1.12.ebuild 1362 RMD160 73d676d77551d3facedad61e3b182c9f80b74f38 SHA1 2fa02d65766166d531b386b8ef62d5b32c5b7457 SHA256 4ef3c40e04a4daa8ee431f47b4b047b0580e17ef7bab0d5568ed484f9694c57f
+MD5 22f7d6328da552cfcf20bb93807283c8 pdftk-1.12.ebuild 1362
+RMD160 73d676d77551d3facedad61e3b182c9f80b74f38 pdftk-1.12.ebuild 1362
+SHA256 4ef3c40e04a4daa8ee431f47b4b047b0580e17ef7bab0d5568ed484f9694c57f pdftk-1.12.ebuild 1362
+MISC ChangeLog 3212 RMD160 78594e10d893417897c84e415e7ddd98fa73487f SHA1 027c24a28239249aa26948742152070aafd8d16a SHA256 e3131dd1b7998708ebf8fbb40de121e5ce13054b02703e9efc67fe2e8168906d
+MD5 ca814588d8ebc308159b01433a734188 ChangeLog 3212
+RMD160 78594e10d893417897c84e415e7ddd98fa73487f ChangeLog 3212
+SHA256 e3131dd1b7998708ebf8fbb40de121e5ce13054b02703e9efc67fe2e8168906d ChangeLog 3212
 MISC metadata.xml 181 RMD160 65894e0e1f4f9f37fafaaf25d64fbe8197b3b63e SHA1 27f62b7ee56c4e616ad76df80ea20b1cc6ee9eba SHA256 3bc248a6c152ec3a470e3eb2d4021a30538451de4e63859f448b3ce4b25a1aaa
 MD5 17176c86312c40cd13caa8277f0fd57b metadata.xml 181
 RMD160 65894e0e1f4f9f37fafaaf25d64fbe8197b3b63e metadata.xml 181
@@ -25,7 +25,7 @@ SHA256 1ca767b602683d6b855a1c1326f37bcf190ca258ac6259cedf0b02362d59a2b4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGJVR5cxLzpIGCsLQRAr6TAKCEGmgJDr9Y2y1YK0tR5wb8hTBQ7QCgk0Qw
-IBR8RId1ozoYDYEjCWrshow=
-=w/Ii
+iD8DBQFGJVU4cxLzpIGCsLQRAp4hAJ4nSDPCI29Ud3BDfx0w+FuNHeUYKQCeKmEM
+BGdxjQ9NpNcGTL3yVJZqDgU=
+=DoXn
 -----END PGP SIGNATURE-----

diff --git a/app-text/pdftk/pdftk-1.12.ebuild b/app-text/pdftk/pdftk-1.12.ebuild
index b202d8c5fb80014f4324d9c52fb62fb4829e7dec..5735cfc2965e5237d863a88d78bf8e7acad3a17d 100644 (file)
--- a/app-text/pdftk/pdftk-1.12.ebuild
+++ b/app-text/pdftk/pdftk-1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.12.ebuild,v 1.12 2007/04/17 23:12:53 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.12.ebuild,v 1.13 2007/04/17 23:16:01 betelgeuse Exp $
 
 inherit eutils
 
@@ -16,8 +16,8 @@ DEPEND=">=sys-devel/gcc-3.3"
 S=${WORKDIR}/${P}/${PN}
 
 pkg_setup() {
-       if [ -z "$(which gcj 2>/dev/null)" ]; then
-               eerror "It seems that your system doesn't provides a Java compiler."
+       if [ -z "$(type -P gcj 2>/dev/null)" ]; then
+               eerror 'It seems that gcj is not in ${PATH}.'
                eerror "Re-emerge sys-devel/gcc with \"gcj\" enabled."
                die "gcj not found."
        fi