Fix #134834 properly by forcing LC_ALL instead of LC_COLLATE.

Package-Manager: portage-2.1.2_pre2-r5

3 files changed, 37 insertions, 29 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 7a7d867ece48..81cb1106835a 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.93 2006/09/25 12:18:48 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.94 2006/10/06 18:47:53 vapier Exp $
+
+  06 Oct 2006; Mike Frysinger <vapier@gentoo.org> graphviz-2.8-r2.ebuild:
+  Fix #134834 properly by forcing LC_ALL instead of LC_COLLATE.
 
   25 Sep 2006; Luca Barbato <lu_zero@gentoo.org> graphviz-2.8-r2.ebuild:
   dont depend on swig if you arent building bindings
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 7bb2493b1c5d..1d59c0f6b5b7 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gdgen.c.patch 756 RMD160 b7ce39a4f82362974a7815a1fea24a6aa7be6c7d SHA1 4138a9beb80d854a857368d751521e37c2f8358f SHA256 13da476f3aa8aca5c96ebe82308a937a4391815f3d9bd768ad08cadc8218f6b7
 MD5 5e8726d7d859188692efcfe9e9155761 files/gdgen.c.patch 756
 RMD160 b7ce39a4f82362974a7815a1fea24a6aa7be6c7d files/gdgen.c.patch 756
@@ -30,14 +33,14 @@ AUX graphviz-2.8-notcl.patch 597 RMD160 33b38d5e1fb72dbe0e9b60cd5c58617dd6a9eb9a
 MD5 65a1e6939d49ecf72fb450be96465fde files/graphviz-2.8-notcl.patch 597
 RMD160 33b38d5e1fb72dbe0e9b60cd5c58617dd6a9eb9a files/graphviz-2.8-notcl.patch 597
 SHA256 9158e2ee37b537d58e7325f76e677dcfab640c43554cbf35d22d1b618cef12a8 files/graphviz-2.8-notcl.patch 597
-DIST graphviz-1.10.tar.gz 3357416 RMD160 2cccc756d4156936d32659e77348238d8e9ac49c SHA256 2400b786c605d8b022b52767038942f93494b0239da1d5541c7b5394207753a0
-DIST graphviz-1.12-configure.ac.bz2 7502 RMD160 976c94a596a3b991f7e247cbcdfe23772387dea6 SHA256 d03368f0cb81e05dd200735dbd90b355518cd1c9ed2681b80e10a8ab147a70af
-DIST graphviz-1.12.tar.gz 3371279 RMD160 bba80d67e94c140e0977e02c13f15fc096ecfe64 SHA256 6f7b5f72258e1254f62ff0baed1faeab83e764b7946384d417e306ae0e04e64e
+DIST graphviz-1.10.tar.gz 3357416 RMD160 2cccc756d4156936d32659e77348238d8e9ac49c SHA1 ddb54a6050800837c8dd6613676ff17bf31d5e4b SHA256 2400b786c605d8b022b52767038942f93494b0239da1d5541c7b5394207753a0
+DIST graphviz-1.12-configure.ac.bz2 7502 RMD160 976c94a596a3b991f7e247cbcdfe23772387dea6 SHA1 1312bf9d28e271c5b8a5850b5dc8e63877ea7e31 SHA256 d03368f0cb81e05dd200735dbd90b355518cd1c9ed2681b80e10a8ab147a70af
+DIST graphviz-1.12.tar.gz 3371279 RMD160 bba80d67e94c140e0977e02c13f15fc096ecfe64 SHA1 78f56aaa92f5d58436e5bb5bafd18bb09e04e2d0 SHA256 6f7b5f72258e1254f62ff0baed1faeab83e764b7946384d417e306ae0e04e64e
 DIST graphviz-1.16-panic.patch.tar.bz2 201 RMD160 99c11a90d912e05040aa08b8765a37da99a64745 SHA256 96a2b2a1f84116b4ca10b46a554cad2845742dd3b294e0affde431c9d1e30fa1
 DIST graphviz-1.16.tar.gz 4387670 RMD160 c21988105cc1fe29b65abe5c26977c0a0083092f SHA256 5efa714f0634b42da99696db8610f82d734cb94d06efb5deae5b7c8e755b08df
 DIST graphviz-2.2.1.tar.gz 4371071 RMD160 9e82389d40dfa71643ba1a8b0867051fe32175d2 SHA1 ee32fef44627289e6631e0606c3e8aeb619924aa SHA256 281fb1a4692ef26fd2bb4ebdecc9a86a965922b6a319dc2b4375cfb6b2ad9ca2
-DIST graphviz-2.2.tar.gz 4379295 RMD160 d1f97c236d045a43f8369f2fba3e4167b778eda7 SHA256 ede074976937086b490882c203da986213e80e2a02b20b8b1349f0b9a9f6ca7b
-DIST graphviz-2.4.tar.gz 4074857 RMD160 a9cf7ea13d01eb7e06f3dd1c705a0f9f36db9b48 SHA256 1b1b9348af629fd58a4a16ab0fbff9954a183194f72466255b2bd08a2ded095b
+DIST graphviz-2.2.tar.gz 4379295 RMD160 d1f97c236d045a43f8369f2fba3e4167b778eda7 SHA1 2583bdd3ff082bf3a93ad7313b3261bea23a0f90 SHA256 ede074976937086b490882c203da986213e80e2a02b20b8b1349f0b9a9f6ca7b
+DIST graphviz-2.4.tar.gz 4074857 RMD160 a9cf7ea13d01eb7e06f3dd1c705a0f9f36db9b48 SHA1 f8740ba2c78f3fd44c765dcb61b87a1f7e533ed5 SHA256 1b1b9348af629fd58a4a16ab0fbff9954a183194f72466255b2bd08a2ded095b
 DIST graphviz-2.6.tar.gz 4109848 RMD160 555c6c635b5271b09ffb7ee142192a1b4ec07919 SHA1 062897f364c905f33852caff93899df97c817def SHA256 5208949dd8702205a5d65dfee4439870e36681aa076220cb159d28536fa2cca9
 DIST graphviz-2.8.tar.gz 4243130 RMD160 d3b46e9777e9db5ead4fdf5274c6bd10823fe4cd SHA1 fca24335689de909d1f2af09d408ae4a9c41dbca SHA256 be0c4b7e49f7c226c68d54bb47018f3b3bfb51bb992f5ad71da875cad13367ca
 EBUILD graphviz-1.10.ebuild 1274 RMD160 a71888fe6e01c684d5348159790ccf8c88583af7 SHA1 e4990536e0ad0bb6551fa7e92a6d7de8bc2659fd SHA256 d8a0ba43a371b44895d8b704cff27cbce60fb801dc13e78e57de52455d3f48bb
@@ -88,18 +91,18 @@ EBUILD graphviz-2.8-r1.ebuild 1946 RMD160 f83a980b5d5296df2fbcca6e2dbed07c324498
 MD5 e32cbfef9f0fc014c63ac7bc3ead524a graphviz-2.8-r1.ebuild 1946
 RMD160 f83a980b5d5296df2fbcca6e2dbed07c324498e4 graphviz-2.8-r1.ebuild 1946
 SHA256 704055c9b1b68874f84dd6e8e7b25d26855cb0f502b4f9d3d9ce90640b3d2ba9 graphviz-2.8-r1.ebuild 1946
-EBUILD graphviz-2.8-r2.ebuild 2583 RMD160 8ed14985aacf9dae7ea3cbadc08e2e54ef7319dc SHA1 712a663e0b4339b4f1c7ba540cce246b095f4039 SHA256 e454b671267912d1c31bb7ee2152ccdd9b3e5b9fa6989bdb817edef22ef51ce4
-MD5 a09bcd499146b36e0025c5d09028a142 graphviz-2.8-r2.ebuild 2583
-RMD160 8ed14985aacf9dae7ea3cbadc08e2e54ef7319dc graphviz-2.8-r2.ebuild 2583
-SHA256 e454b671267912d1c31bb7ee2152ccdd9b3e5b9fa6989bdb817edef22ef51ce4 graphviz-2.8-r2.ebuild 2583
+EBUILD graphviz-2.8-r2.ebuild 2577 RMD160 e4324a03243539f0983c56e9d912652e021c4c8c SHA1 b2e30f672eb6f62481c323909ab40f22f6cc47da SHA256 b1392ec56cae2ab166d1f160bad82720325b14eec559c01b42c98cb55c3ad19c
+MD5 50ae6f40c06a2a0030dfb6d379687330 graphviz-2.8-r2.ebuild 2577
+RMD160 e4324a03243539f0983c56e9d912652e021c4c8c graphviz-2.8-r2.ebuild 2577
+SHA256 b1392ec56cae2ab166d1f160bad82720325b14eec559c01b42c98cb55c3ad19c graphviz-2.8-r2.ebuild 2577
 EBUILD graphviz-2.8.ebuild 1930 RMD160 0a511fe44f62392f7d538197c2f3e88175566ab9 SHA1 e4f6ce146120ec1000e93a2727932432a7bfe2eb SHA256 a4b0ea0504f1aaec83ebbcfc4c3fafe71afa9a610860dc7d1d5ae84b8b571af7
 MD5 1030c0ba274eb6ae5e9c0b4e503b1d6f graphviz-2.8.ebuild 1930
 RMD160 0a511fe44f62392f7d538197c2f3e88175566ab9 graphviz-2.8.ebuild 1930
 SHA256 a4b0ea0504f1aaec83ebbcfc4c3fafe71afa9a610860dc7d1d5ae84b8b571af7 graphviz-2.8.ebuild 1930
-MISC ChangeLog 13901 RMD160 ef790256d29eec9ef320e27b813ae6871edc7d55 SHA1 f2b1d3d4da19ec0f99b2f30a00baa30909168882 SHA256 a037a55c30783a625acb4a4be4c8669b427630baf660cfca6de41f5bb5b36034
-MD5 0ec3e382e25da66d559173c3e77ba0e0 ChangeLog 13901
-RMD160 ef790256d29eec9ef320e27b813ae6871edc7d55 ChangeLog 13901
-SHA256 a037a55c30783a625acb4a4be4c8669b427630baf660cfca6de41f5bb5b36034 ChangeLog 13901
+MISC ChangeLog 14039 RMD160 d5257d59c6d2dfb7fb7c7479914bded0c8e883b9 SHA1 800532d35282bc4961434b9e3f8caecdf4709a6d SHA256 e08f3a891e62b408db81026c52cf3cb7c76f890252c5834d7d1e3a7ac9775454
+MD5 4a6e3f0cf174430e1bbfda15c9c13fe1 ChangeLog 14039
+RMD160 d5257d59c6d2dfb7fb7c7479914bded0c8e883b9 ChangeLog 14039
+SHA256 e08f3a891e62b408db81026c52cf3cb7c76f890252c5834d7d1e3a7ac9775454 ChangeLog 14039
 MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 metadata.xml 1540
@@ -146,3 +149,10 @@ SHA256 46c7992c928f975cf353d76bf16f2c1f95442c40aa8d95f9a6914d69f567e802 files/di
 MD5 e3e4ae371fc2d864bfc0abf37ed6a8e7 files/digest-graphviz-2.8-r2 241
 RMD160 5fb21035102566ae43b15e15cfa41c26e5d1a195 files/digest-graphviz-2.8-r2 241
 SHA256 46c7992c928f975cf353d76bf16f2c1f95442c40aa8d95f9a6914d69f567e802 files/digest-graphviz-2.8-r2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFJqTqamhnQswr0vIRApvzAKCl/EHAPONJspV5Fb7CxMWDCBEJYACgmZMM
+ihlc8iGo/XipnhiKau7D540=
+=ihky
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/graphviz-2.8-r2.ebuild b/media-gfx/graphviz/graphviz-2.8-r2.ebuild
index 0ca863d8baab..83ac3ae84811 100644
--- a/media-gfx/graphviz/graphviz-2.8-r2.ebuild
+++ b/media-gfx/graphviz/graphviz-2.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.8-r2.ebuild,v 1.3 2006/09/26 17:32:18 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.8-r2.ebuild,v 1.4 2006/10/06 18:47:53 vapier Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -34,10 +34,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3
 	php? ( dev-lang/php )
 	python? ( dev-lang/python )
 	ruby? ( dev-lang/ruby )
-	X? ( || (
-	    ( x11-libs/libXaw x11-libs/libXpm )
-	virtual/x11 )
-	)
+	X? ( x11-libs/libXaw x11-libs/libXpm )
 	sys-devel/libtool"
 
 DEPEND="${RDEPEND}
@@ -50,15 +47,13 @@ DEPEND="${RDEPEND}
 	lua? ( dev-lang/swig )
 	php? ( dev-lang/swig )
 	python? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )
-	"
+	ruby? ( dev-lang/swig )"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch ${FILESDIR}/${P}-notcl.patch || die "epatch failed"
-
-	elibtoolize
+	epatch "${FILESDIR}"/${P}-notcl.patch
+	sed -i 's:LC_COLLATE=C:LC_ALL=C:g' lib/common/Makefile.* #134834
 	eautoreconf
 }
 
@@ -78,9 +73,9 @@ src_compile() {
 		$(use_enable python) \
 		$(use_enable ruby) \
 		--disable-{sharp,io} \
-		$(use_with X x) || die "Configure Failed!"
-
-	LC_ALL=C emake || die "Compile Failed!"
+		$(use_with X x) \
+		|| die "Configure Failed!"
+	emake || die "Compile Failed!"
 }
 
 src_install() {
@@ -93,8 +88,8 @@ src_install() {
 		pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
 		install || die "Install Failed!"
 	if use minimal ; then
-	    rm -rf "${D}"usr/share/doc/${PF}/{pdf,html}
-	    rm -rf "${D}"usr/$(get_libdir)/${PN}/{tcl,lua,perl,python,ruby}
+	    rm -rf "${D}"/usr/share/doc/${PF}/{pdf,html}
+	    rm -rf "${D}"/usr/$(get_libdir)/${PN}/{tcl,lua,perl,python,ruby}
 	fi
 	dodoc AUTHORS ChangeLog NEWS README
 }