Fix building without dev-util/intltool and sys-devel/gettext wrt #443028, Comment #3 by Mike Frysinger

Package-Manager: portage-2.2.0_alpha154/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 42 insertions, 17 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 32bfebd3e476..844e5bc66b8e 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.772 2013/01/17 17:32:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.773 2013/01/17 18:06:51 ssuominen Exp $
+
+  17 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r3.ebuild,
+  udev-9999.ebuild:
+  Fix building without dev-util/intltool and sys-devel/gettext wrt #443028,
+  Comment #3 by Mike Frysinger
 
   17 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-171-r10.ebuild:
   Change KV_min and KV_reliable from 2.6.32 to 2.6.31 because it was 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index b5331741a30a..9869e6be91d1 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -14,19 +14,19 @@ DIST udev-gentoo-scripts-7.1.tar.bz2 16257 SHA256 1923768a98b7f00ffdc9bdf5a2c998
 EBUILD udev-171-r10.ebuild 16118 SHA256 aae3766bf1ffc74bfc325da6e2146267d231a9956fae5542a18edda6dae67057 SHA512 433e0643616debfc7970d05e3c84ea57592b4d490b64d6f84b59d7a8096c7be8ecb1386548188c548bcea89470962c066fdaa730d6b71abf3ea7975956421656 WHIRLPOOL c85d52dcd70e972813a31545656c88f0c9c997c62d1e958f894237c0f6b085667ef71792ddd773571d3d27275b6bf0a1d7fe3c44f24d062312e268d78879081f
 EBUILD udev-171-r9.ebuild 16105 SHA256 1b21d6b2fd4af6382ab5cf3c255cb6c2b2f026ffbfbd808db8662b958de30f1b SHA512 efce00bbb87120a476fc2bfd497a460b3656024389fc2ac999dcaac8e95e2450d101038b0838d0a9f8dbc948c4b1f42e6cc3819df2857839564806f7293e5af9 WHIRLPOOL 7e73e343a7778bffdb5002fa0994a3d4e55972d230877d6501afc777717244eb81b16a50e9a28ed698b8842c8b5c44b182825ac9c551217a2401009eb31b1761
 EBUILD udev-197-r2.ebuild 11018 SHA256 50e5824d12eec484b25f5ae2229cd57d18d10be5ed46d09e810b9f330ad31c82 SHA512 7ee20ab00a87a73e6ebdb92e6c2f6b29e287a0b1e85b1c095fb88f08590b0cc1759734b059cf2775bd8e1e704ebf16ed278472d9ced8cc8c442e5fcfef745cc8 WHIRLPOOL 8105d815f0599b93f6d3c637586cecc126e00f228c5dae19860e71e4ab53c8dc89f58b6566f4fbae368509c08bd11c3455863464a4d324ed1b4e4b1f95ac5371
-EBUILD udev-197-r3.ebuild 11064 SHA256 064172addbda596f0d6623a091c3a001b4d61c9d1aaa07480bcbeeb42e7f1c6d SHA512 d2a1b9cf4f122bcd4f8ab8aa39c82a5c9ee8899d3dff7652f51b7d40612b5a775eeb6b0aee34c0bef17f52145f9d003a951da17c3a77f1ef943cc24246cd0b29 WHIRLPOOL 4caa724db7b33dae7d0096ca641507304ce832e377f7adce690f7499f6748c113038cbb694fedf19ae71727c3a04b8d310d8a64e263e27cee0b22ad7f33ef2c2
-EBUILD udev-9999.ebuild 11063 SHA256 4f7633e98d661783c6523148b0305055265c3b1259a42f409ad89ab895807281 SHA512 7fcf582af0741f0074f42c708e51f4ea8b4a7f67100e861ef47b1cd85ab3511c700706f7081709fa3df0f545c0ca9648d909c555f48fe5efac76708509f7a75f WHIRLPOOL 3e84e19b58e874ff43a918617a9c65cd69ade3de459e3a4400151d29a2e17470ffcf34c5b3587f6c461716caac1e9e19bea91c8c2d4b0c66c9d3011eb143e79a
-MISC ChangeLog 48713 SHA256 d6115476c6514855a485260ff1827a5ce0a55f350c22f02d1844c1c6fd613464 SHA512 2e623dd35f731e699b7e9d8443c3869d6c49b702af8b72c1f3e5f139e81d151c59f68ea622276e23fa28862fca76d917d61ab963e834578b6f208d58ea371663 WHIRLPOOL 043d5a5459c0debee40b62a10d425cae1dcd73313e855258423092dbd427053b0f20294a6c56dc299b77ae6838e17abd8bc3ddd0f302cae413a41252dbfc6606
+EBUILD udev-197-r3.ebuild 11471 SHA256 7b20a745322e346f83e08f3275399b755edc22a9778a4c3c2e76d411731b3b9b SHA512 0743cc56f63cb7a36c43c15362d4f62ec461df94c1fea8072449551a4b4d3cbef7ff7060c07fbda435847d4bffbe0caea5b3740d1d9c4731057d07ebb67060e6 WHIRLPOOL 566c789b6ce49fbc4f78d9a0d118ee0e847bc3cab598016f58b0f8128aa68eb65ce94defa46bd56cdc19a698945df9d9fdb374bcf40d0090cbc43ca6504d8b88
+EBUILD udev-9999.ebuild 11470 SHA256 92eeb6548255bc075bfabbd67cf621479735715da96239a7a0a4fdc5240c1a89 SHA512 bbece82bedd23956d817a5fd2d295a64b2bec358215769186edeecd63336b9717648051b1d740d07c63c656426b9cfb55a3147e223cf04f8dc414a4afeaf47c5 WHIRLPOOL 743121772cc0398c14c7b9330a62cd8f587fbfa045cc34bef371778e3a587ee4642d937800953eff1fbeafd040c947b066abdf489a3509fb0d844356595b17a4
+MISC ChangeLog 48915 SHA256 ef54fa984390ced1328a58952507f9569d49dfb30ead3ac1a298a827d16530fe SHA512 d2fdeab89893272b2c52063260ccc44e476b2dc661658ec04e73e0f09f68ea47e7cb745247570f1a72082c8c270bd8e2e8cb4db11d3be844bb8d2395a18d60e2 WHIRLPOOL c5a7c18fad704735cac6a12a9bb3cd09cc6776e60e0cf8f07420f919294469194432e6c8034fe81c47c6ee3bb2de7f4f97a4781171c4c0d197ac05b982529fbf
 MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5
 MISC metadata.xml 1098 SHA256 69d8c28e0c2439c252068ae2e0141a9bad7b05e65b9dec27aa2dd3feb4f2393c SHA512 87354f467c3f2ed005a10652a2f80ffda010fbc0c6fb88436b906c92f4cf1543ed1a6cf4a49c93f15c6fea3ba0dcd108e1e120954f7b0860e7ac90072d2b3d67 WHIRLPOOL 9c01df67041d2093e5a2ee4a9ad65df613cdcb163bc366c8592e8e2be84b176da13198261a012687188918c906291d765856665806efe03b8dfb22a5b4eb6834
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ+DVzAAoJEEdUh39IaPFNM4EH/1Z96g7nUPiwRREO0hMAWj1H
-hPPWC97RIfwjmLx9lHStMRy9ymUkGbm8RK1lNitXK2esxoi36Gm5pKunKoUOQNch
-Lhz6hlq4NLRlwYdpeH0wtQWi2re1KUoJH95vXyBYoVEvP5WSv1JtvJ1YJlaVP5mm
-Ie8h8bAlnIZTFJqd+sINqJT86pkUHG8yMllDiL7WHWh8u0Pq5KL9N0KqTOLjf7Ao
-Oy21a9/y0F/Ti3p+6qXhgz5eLCNe4iiUVIGIp2AH28oI8Pj46MQVczNrVv60S8Pw
-Ocua3qlfBIl9qpYmkS/hnfvrRhheCYFkBuh0idQDBKq5L3Kdf3+BvCxdkPya19M=
-=i1bC
+iQEcBAEBCAAGBQJQ+D1sAAoJEEdUh39IaPFNXdQH/0dQsywUg4c7awA93RtLpft3
+2GxLI5KwCBQGYkFS0aeTcx7Ohoic45iBG+ZyCOkIk2k9lceF53zFXl7g9/W56pxx
+igfbAZnsjc/lrvszAW9LGD5BypZ49bml4iHz1llwTMTVoZijSTHCukoINjP9B7wp
+/ypKd1OCl/Kl0TVhT5r7iH6ikPzgEFquYwbMTSEUrfitwzni2CEH9aCscj9J0uQ+
+H2VXpjx8KIrZsrTTxGkWeAuadM6XHHgv8tYH9vsk3nZ4AyOztn9nFKIh5Yf2OspA
+8tTwRioJuHbHEYPO1wOxO/Ek5gpqHnFBNTViRp/o10KTPwTCA7hitt5HXST2W9I=
+=VNmx
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-197-r3.ebuild b/sys-fs/udev/udev-197-r3.ebuild
index f51e0111e08a..fdc55209ed59 100644
--- a/sys-fs/udev/udev-197-r3.ebuild
+++ b/sys-fs/udev/udev-197-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r3.ebuild,v 1.2 2013/01/17 00:42:19 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r3.ebuild,v 1.3 2013/01/17 18:06:51 ssuominen Exp $
 
 EAPI=4
 
@@ -42,7 +42,6 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
 
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
-	>=dev-util/intltool-0.50
 	virtual/os-headers
 	virtual/pkgconfig
 	!<sys-kernel/linux-headers-${KV_min}
@@ -53,7 +52,8 @@ if [[ ${PV} = 9999* ]]
 then
 	DEPEND="${DEPEND}
 		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt"
+		dev-libs/libxslt
+		>=dev-util/intltool-0.50"
 fi
 
 RDEPEND="${COMMON_DEPEND}
@@ -129,6 +129,16 @@ src_prepare()
 		EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
 	fi
 
+	# Remove requirements for dev-util/intltool, sys-devel/gettext, see #443028
+	if ! has_version dev-util/intltool && ! [[ ${PV} = 9999* ]]; then
+		sed -i \
+			-e '/INTLTOOL_APPLIED_VERSION=/s:=.*:=0.40.0:' \
+			-e '/XML::Parser perl module is required for intltool/s|^|:|' \
+			configure || die
+		eval export INTLTOOL_{EXTRACT,MERGE,UPDATE}=/bin/true
+		eval export {MSG{FMT,MERGE},XGETTEXT}=/bin/true
+	fi
+
 	# apply user patches
 	epatch_user
 
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 389a9d3024bc..0f1426b67ad5 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.133 2013/01/17 00:42:19 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.134 2013/01/17 18:06:51 ssuominen Exp $
 
 EAPI=4
 
@@ -42,7 +42,6 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
 
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
-	>=dev-util/intltool-0.50
 	virtual/os-headers
 	virtual/pkgconfig
 	!<sys-kernel/linux-headers-${KV_min}
@@ -53,7 +52,8 @@ if [[ ${PV} = 9999* ]]
 then
 	DEPEND="${DEPEND}
 		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt"
+		dev-libs/libxslt
+		>=dev-util/intltool-0.50"
 fi
 
 RDEPEND="${COMMON_DEPEND}
@@ -129,6 +129,16 @@ src_prepare()
 		EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
 	fi
 
+	# Remove requirements for dev-util/intltool, sys-devel/gettext, see #443028
+	if ! has_version dev-util/intltool && ! [[ ${PV} = 9999* ]]; then
+		sed -i \
+			-e '/INTLTOOL_APPLIED_VERSION=/s:=.*:=0.40.0:' \
+			-e '/XML::Parser perl module is required for intltool/s|^|:|' \
+			configure || die
+		eval export INTLTOOL_{EXTRACT,MERGE,UPDATE}=/bin/true
+		eval export {MSG{FMT,MERGE},XGETTEXT}=/bin/true
+	fi
+
 	# apply user patches
 	epatch_user