Revert intltool-extract detection; bug #168832

Package-Manager: portage-2.1.2-r12

diff --git a/dev-util/intltool/ChangeLog b/dev-util/intltool/ChangeLog
index 176a28a4dbc9fc471a279738f4654dc86e15a9d3..509abcbba980f45aff323b5ad1a7d84dabba9c12 100644 (file)
--- a/dev-util/intltool/ChangeLog
+++ b/dev-util/intltool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/intltool
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/intltool/ChangeLog,v 1.93 2007/02/26 20:54:50 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/intltool/ChangeLog,v 1.94 2007/03/01 16:58:44 dang Exp $
+
+  01 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/intltool-0.35.5-update.patch, intltool-0.35.5.ebuild:
+  Revert intltool-extract detection; bug #168832
 
 *intltool-0.35.5 (26 Feb 2007)
 

diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest
index ac740a0f6a1530daf16c20f5336dc6797442df65..5217b80369c9d8b7f198f84088b75cca7491c386 100644 (file)
--- a/dev-util/intltool/Manifest
+++ b/dev-util/intltool/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX intltool-0.35.5-update.patch 691 RMD160 efc3cebe1490aa481655b88ec13f2c788b60e0e6 SHA1 36508eb97faf860e4c7f50395b8a8c97cc531836 SHA256 cdac14f73e36f560d36dda1696db275e56fef2343be610fd6608596e43b9948b
+MD5 efe8366b4e3f9df83918d6c91870fcf6 files/intltool-0.35.5-update.patch 691
+RMD160 efc3cebe1490aa481655b88ec13f2c788b60e0e6 files/intltool-0.35.5-update.patch 691
+SHA256 cdac14f73e36f560d36dda1696db275e56fef2343be610fd6608596e43b9948b files/intltool-0.35.5-update.patch 691
 DIST intltool-0.35.0.tar.bz2 129933 RMD160 00cd68879d9743f52c03ca723f20ac0aab6e79e0 SHA1 5e4e90e79696dbca1798753bd4135aa8556887f4 SHA256 4ebece4bb752e22b2f15a9fe24e83aec59a3a41b67a9fa9ffd6b805c519e90ba
 DIST intltool-0.35.4.tar.bz2 134225 RMD160 555ecd6ff112cf4df9cf35f0ba35084be0c69027 SHA1 93d572a461744a0b4104a3afd7d18119e9a2db7b SHA256 fe30812f6fe4ac09423f704de299240f38c3cdd92c973a2bd215deb158fe0ff2
 DIST intltool-0.35.5.tar.bz2 134902 RMD160 c0d2daf7db51ac4ecbcb5f8dafd8116712859d6b SHA1 df8aa0543e4d9fc100c3268aa6e6a777a81a2461 SHA256 38bd74418bbac5a34884221e2b710a81876d445d8acfc7d22bde67fe882f96d8
@@ -12,14 +16,14 @@ EBUILD intltool-0.35.4.ebuild 708 RMD160 404d685fa6518ad919610c2f17bc2d97cdbb4a8
 MD5 8379457a74d455c97819b9625083e4c8 intltool-0.35.4.ebuild 708
 RMD160 404d685fa6518ad919610c2f17bc2d97cdbb4a8e intltool-0.35.4.ebuild 708
 SHA256 09104c0da0d90b7e59019e441257b6e28ff07aa038bdc198f09aa0ed8de91795 intltool-0.35.4.ebuild 708
-EBUILD intltool-0.35.5.ebuild 705 RMD160 45934c0105560422220499c1ee654122ccda97b8 SHA1 39cd6efa57ea41fda370ad750ff9d52cbf3cee0e SHA256 411e8cad6da7894f93b7617f9d737c54bf7821c2328beaad8bc51bcf18abf36e
-MD5 dd5e42a420dc56b9f8fd846db831e948 intltool-0.35.5.ebuild 705
-RMD160 45934c0105560422220499c1ee654122ccda97b8 intltool-0.35.5.ebuild 705
-SHA256 411e8cad6da7894f93b7617f9d737c54bf7821c2328beaad8bc51bcf18abf36e intltool-0.35.5.ebuild 705
-MISC ChangeLog 10335 RMD160 7667ea1671e70ab7514c6cfd7d14786556bd7561 SHA1 d9da5272d4e327615d8e4d4d05eb70c1594f3390 SHA256 22d420f665f54f6a8610e08c58a0bc5b8d0325a1299161f1d3c33f86fa795fad
-MD5 4aa2e4f9d46f891a8fc52262b423024c ChangeLog 10335
-RMD160 7667ea1671e70ab7514c6cfd7d14786556bd7561 ChangeLog 10335
-SHA256 22d420f665f54f6a8610e08c58a0bc5b8d0325a1299161f1d3c33f86fa795fad ChangeLog 10335
+EBUILD intltool-0.35.5.ebuild 792 RMD160 376db4440cb0bc635313ec2ed1898193248d36da SHA1 9aa20bd882e0e51a0a5be5671c25381ac8f31fa3 SHA256 bb812c8816732b90dcd5e87f42be66dc4965325894cb11c5c8820d3343eb8c46
+MD5 f7add91b276111c1fe394c22978327ca intltool-0.35.5.ebuild 792
+RMD160 376db4440cb0bc635313ec2ed1898193248d36da intltool-0.35.5.ebuild 792
+SHA256 bb812c8816732b90dcd5e87f42be66dc4965325894cb11c5c8820d3343eb8c46 intltool-0.35.5.ebuild 792
+MISC ChangeLog 10499 RMD160 26b6fd163faf451556bf78eb0e8111e25b652b84 SHA1 199f9a648e07b60865a90e4f1516a7f551f2079d SHA256 80f018ab2f14b2cec594cdfb07d8e90e32772bcac742ed527e2fb391af4b52e5
+MD5 8d8431436a3f2238fef5d85448476f0b ChangeLog 10499
+RMD160 26b6fd163faf451556bf78eb0e8111e25b652b84 ChangeLog 10499
+SHA256 80f018ab2f14b2cec594cdfb07d8e90e32772bcac742ed527e2fb391af4b52e5 ChangeLog 10499
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -36,7 +40,7 @@ SHA256 ad1985f89ec812e582a95a2a7a9f4db78a22aab8ba266819aad8f22c54b6f33e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF40iJomPajV0RnrERAlv8AJ0bX1UdPJ3SJ2VKAIVUhyubvMsLFwCfe0SG
-KMkNGbNLJJJnOcNlEDwxfd8=
-=1vNA
+iD8DBQFF5wWMomPajV0RnrERAqsYAJ9Gp0WWQosDTEA4UQHu9ePOEOsHAACfcP8o
+NjAL1wInDPtl4taTGVauP04=
+=aZuu
 -----END PGP SIGNATURE-----

diff --git a/dev-util/intltool/files/intltool-0.35.5-update.patch b/dev-util/intltool/files/intltool-0.35.5-update.patch
new file mode 100644 (file)
index 0000000..e316dea
--- /dev/null
+++ b/dev-util/intltool/files/intltool-0.35.5-update.patch
@@ -0,0 +1,15 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN intltool-0.35.5.orig/intltool-update.in.in intltool-0.35.5/intltool-update.in.in
+--- intltool-0.35.5.orig/intltool-update.in.in 2007-02-13 23:08:40.000000000 -0500
++++ intltool-0.35.5/intltool-update.in.in      2007-03-01 11:51:21.000000000 -0500
+@@ -565,7 +565,10 @@ sub Console_WriteError_InvalidOption
+ 
+ sub GenerateHeaders
+ {
+-    my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
++    my $EXTRACT = "/usr/bin/intltool-extract";
++    chomp $EXTRACT;
++
++    $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
+ 
+     ## Generate the .h header files, so we can allow glade and
+     ## xml translation support

diff --git a/dev-util/intltool/intltool-0.35.5.ebuild b/dev-util/intltool/intltool-0.35.5.ebuild
index fc6df58cee0f8263439b700f09b3432d4ce1ac25..2190459a36655636720522ce8f60a51e1fbd0cd9 100644 (file)
--- a/dev-util/intltool/intltool-0.35.5.ebuild
+++ b/dev-util/intltool/intltool-0.35.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/intltool/intltool-0.35.5.ebuild,v 1.1 2007/02/26 20:54:50 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/intltool/intltool-0.35.5.ebuild,v 1.2 2007/03/01 16:58:44 dang Exp $
 
-inherit gnome.org
+inherit gnome.org eutils
 
 DESCRIPTION="Tools for extracting translatable strings from various sourcefiles"
 HOMEPAGE="http://www.gnome.org/"
@@ -16,6 +16,12 @@ DEPEND=">=dev-lang/perl-5.6
        dev-perl/XML-Parser"
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       epatch "${FILESDIR}"/${P}-update.patch
+}
 
 src_install() {
        make DESTDIR="${D}" install || die "Installation failed"