added prefix support (bug #428564)

Package-Manager: portage-2.2.0_alpha120/cvs/Linux i686

5 files changed, 92 insertions, 14 deletions

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index 707e2f36204d..9f9b6760773e 100644
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/vte
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.328 2012/07/15 18:42:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.329 2012/07/30 13:51:56 ottxor Exp $
+
+  30 Jul 2012; Christoph Junghans <ottxor@gentoo.org>
+  +files/vte-0.28.2-interix.patch, vte-0.28.2-r203.ebuild, vte-0.32.2.ebuild:
+  added prefix support (bug #428564)
 
   15 Jul 2012; Raúl Porcel <armin76@gentoo.org> vte-0.28.2-r203.ebuild:
   alpha/ia64/sh/sparc stable wrt #410611
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index a15fae90d22f..6362b7a55e4f 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,22 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX vte-0.28.2-interix.patch 1566 SHA256 0c3bd451d2a48dd38b375fc7d72b675bbfcbcda66f6fbcdd20eeee315727d518 SHA512 f02574f96355c6cedde05d0877d3bf50e7777d210484a80b6e95e597b0bb225f5968649e67f67d7f112f50302ae6566e4f3d8c59d7a5b65fc95601cac00868d7 WHIRLPOOL cd444a499735517fd523e358fa0ad39f9bd8771911da18f06ddb453cdabace3cdb20e2f9aa13428efb1e6b1227ff9e10b56eb3d27616714ac873eb2a64796ae4
 AUX vte-0.30.1-alt-meta.patch 2490 SHA256 31a46fee8fe59bd1d6df54bc502b608fe80da57bf3786e2dc6e9856a4e793ed6 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430 WHIRLPOOL bc51d9467bb13d627e7355872db5777e3d39ca07753dda9237110f8857d16bca5f8bc4334f9d97df54a2fcbc9234f123247ec8f40508e8120f00ffc46ff0a570
 DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 WHIRLPOOL cf491b80cdfbdda6163ec7562f922f1c449e6e927845de28ad8e0b06b47bbbf092f735fc4b72f6131797d17c02c6172888d4db37a520973118d2bfbacd374c2c
 DIST vte-0.30.1.tar.xz 951688 SHA256 bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64
 DIST vte-0.32.1.tar.xz 974740 SHA256 543e489943d439dc82a4ba54871984ea843c3ef0a1fffa24aa65dabc57e7e4da
-DIST vte-0.32.2.tar.xz 978692 SHA256 d69ec071f7a380d8b8b981b35a9a0b891f37c4b6b17d08407f66ac98d619486a
+DIST vte-0.32.2.tar.xz 978692 SHA256 d69ec071f7a380d8b8b981b35a9a0b891f37c4b6b17d08407f66ac98d619486a SHA512 0346a3a85de8bfc84fce37f073154ee7af746b8872e7970f4f58e11cf261311def714100370c2eb371beecba5d22207dfdada7b0df7fee00f32035e93b9e8808 WHIRLPOOL f543dc7b0ce8b818aaa5df9ea965a9b501e0e62df0bae5f3a4a658c89b51f9e8fac4f9c7c7ee491b284407846045dd749c4a02ef360bc6920d19a20aa13dd672
 EBUILD vte-0.28.2-r202.ebuild 1615 SHA256 b728e702cc6f05acc2690a8ab6d890b5d1ce1834443fb1e88788558402527836 SHA512 96141f1b9d92709029eea17be44a0f701ecfa022c2a59f50c197d814643959b15f1cb1ee07bf077627e199a222c6fbf26957b22c579b1bbf1224c1b04bca1e69 WHIRLPOOL 5dd62837238c1d4bdd1cc6ba0c702f6fa8d33eec5e871744dff0acc0bcacefbd8c85ac091eec59ea595c8bad7516b6c7da6536b0a498de8a2e9bc2d93bd61645
-EBUILD vte-0.28.2-r203.ebuild 1685 SHA256 9cffeea04a4a35b44b5a5a6fda4a9614e621bdb53198b70de651ad1d702bf325 SHA512 bef294230f30d9a84604f6aa36313470697ed5853447410783e64d1416415d83dd3d356a592f7caec5b6a1c17cc571d22e18a3dcb2392e01f45639d1b4637c38 WHIRLPOOL a4a57430c0ae75bbdb9b2e1257e378c79e0135c546895b9f4c92c84da0120849f0396e0c9b643c4c08a069d5b7a225c8ea235d26788dd75a8bffbc586e992eb2
+EBUILD vte-0.28.2-r203.ebuild 2018 SHA256 63f6a0db1d80619dae4f4cfd5249f9e061d83931f7bd8ec4fb63045bf1cd1007 SHA512 160082dfd67cf46a00c36848291a0e8ae38133842fd0ccab6f145fbc57adcd98eea8c3e01850f702555bca0a54835b3ca078f4810bf5ee4865fd0881f7178826 WHIRLPOOL 3bab4a042159fdf5463df39bfc1d692a5d9301fa1d086f6ea1cb13a1434748672c7ee40b19d79dae4fac91d24294e71816417974760e1fd0351219ccbf7b4ecc
 EBUILD vte-0.30.1-r3.ebuild 1529 SHA256 2bee24cbbbdf21f6ce3a71b222ef69df8cb999c9ff0920a5df1e792a2a953862 SHA512 f1df086b65587d3a8b4ccc984ca8f086079821c62e73aae79afb6cdc34bff48ff0ddfc67a3ac55341bdbe5af3d3b0d877ca5a8fc6f24f732dc01f3a45e6a5891 WHIRLPOOL b844555bb4727d298e65c5b89261e93869d94933066029a70af86eea2065e308a30516d0c1ed4da85a1ceaf77ce680fc8e335fa29e7f9c895e769bcfb7cee8e5
 EBUILD vte-0.32.1.ebuild 1508 SHA256 9e5470997b7ae0e20d932e3d2e239de7eea9ea6e07188ca8848b007af6188332 SHA512 b066207f8c771604b63094c9db585c9e5584240a2e4d44828858be235d5416ccf3731a084c42f211480efaa3ecfafcc596f35de81092d1548e0dee449df671da WHIRLPOOL fdd54c53a92e4955a28d8342c609254a050f5e81fb7cb56242a6c1bd7d59eef32e9576a10f573af02305045bd8c63feb4c5b415173ff5e6945185b8b96d788b8
-EBUILD vte-0.32.2.ebuild 1507 SHA256 c7e91d2aba5e8dbee6a6fa6cea77265b9d5a3fd9b706e5a7ea7cd97eca157c58 SHA512 a86cedc6492d9105f0026dd2852771b02b2e77a8eb2389e762b5aa80dd3a908cf3e8305314cc7e73dfcf427d0ed89f465bae4025238333c4038b19b7da72acf4 WHIRLPOOL 588db4325e89f1f01ec24164ca07e74dae28c66b2ae732ef46d5de0b7e37c960397b703d4ba35b40e1340c2700068c492785c249ee6f13db4ea0129c7d4d8341
-MISC ChangeLog 43947 SHA256 fde1336ac98f94765ac820e327782b64efb6061df235ad83668a68e4f9b1daf7 SHA512 293982369556871a7bd2944769abf9b0a0f54066b7fc95b1078c3307693a64318e8fb77ae26ee5913cddf10f7dae3f17c864672c20cb07a5afab239c00fd421e WHIRLPOOL 80167adfa85b6945cadebd03faac80feecf3bf0eac90f2bca496ab17010a40e41f89d78586ecd8cb9b6ab1519554b28eeea1d9c23888cf2b9c182c49bd962d07
+EBUILD vte-0.32.2.ebuild 1740 SHA256 c49c12eefe21a5339fb41d82c7561b1b0c69bbb03eb1d0393d08725404e2154c SHA512 76c596d466cb7521061d9196e3434ca0b0c23710c17dea8fbd32bf4408cea203ad975bd93cb81eac4479be5fc1d523ca4b6698b49f9dd7d6c90678e528990236 WHIRLPOOL 6c3e15ec36ff1530b11f36dbf33a97e48d1af9a679573f255c4a308003667d4a296ec14fc6e900638ccb18f799c31162faef05d06c53ad4bae25dd85da9f458f
+MISC ChangeLog 44116 SHA256 888b8bacc4d13af93ebab40c9f0ac78117304bd1e5dd3001b604d2f5359bea4c SHA512 7af5fb0a7d0f98c5ac784182f0e5ca9df15ae16b3654364c2c999e493f30ac333bf3bf7db8ca9e0a42bb0040fd6426938ccfd72656ab827e708e20b03aa28988 WHIRLPOOL 71a5ccfc751822c939b5c4cfd8419c07cccc556ec28b03d9a1c3b3d874d0afe126f227748c54e98867eb0add395718126124ee2c679738e32379ae5b87bac8ed
 MISC metadata.xml 350 SHA256 16e77360aaa3f204d03bfad2997aabf51d51c3360f59f6c4d5f24076e9bae0d1 SHA512 3c4547eed3975ceb8ab4f7bf065673d1cd42826d934204d01215d059f986d8ea22523d356faea2afd60a0dbe90cb931b98a0b4c8f023ac7b9c2a184ff3037f23 WHIRLPOOL 718ae321f267549634614d15ae18c673842d094d8de28cbb853f43a3916749b601c662a75ca0e033122ea938b557abc76c48fc2dac724efa829969d109b13521
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlADDy4ACgkQuQc30/atMkAVqQCfc2JON6gHOV0OfLD39Ufp3ECH
-6AIAnjE0JN1O+mwd409wumC6alBtn7CL
-=fpA1
+iQEcBAEBCAAGBQJQFpGDAAoJEOeBhlrCAAWGb4kH/2ezI7LUg07fOkVvWBu4UEJV
+9AO69/86II9ZojrIzuxw23RYNgr8v3dkrXVb2qKQ/LIowR/NlmHvGGJOLPFm3j2L
+svMQq6L7C+vriJx2uRvNl1npDbGfCZSaukrJATB3JwKSaN16AORvd4vnLmTyBA3B
+5SA66dyEqoJuWJIv2pPbIrDj/4l0Hym/W92ocP6S9SfBDp+huskdROHceldNBKwy
+EG7osrHJYagDYb/iRrp0V3rzTgZFWUOOTpYGearcqWzQDXoVdcddC17S5YIwKtan
+jA338b4mZ7ftqNQS0UtjpE3j9L1C4M348nSgN3FxxXkB5meU56ti0ir3sDlx1bU=
+=dZtV
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/vte/files/vte-0.28.2-interix.patch b/x11-libs/vte/files/vte-0.28.2-interix.patch
new file mode 100644
index 000000000000..c54d46ebc3dc
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.28.2-interix.patch
@@ -0,0 +1,51 @@
+reported upstream: https://bugzilla.gnome.org/show_bug.cgi?id=652290
+
+diff -ru vte-0.26.2.orig/configure.in vte-0.26.2/configure.in
+--- vte-0.26.2.orig/configure.in	2011-08-17 08:30:55 +0200
++++ vte-0.26.2/configure.in	2011-08-17 08:35:42 +0200
+@@ -362,7 +362,11 @@
+ 	AC_DEFINE(HAVE_RECVMSG,1,[Define if you have the recvmsg function.])
+ fi
+ AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
+-AC_CHECK_FUNCS([ceil floor])
++dnl if the first check didn't find floor, it caches the "no" value,
++dnl and doesn't recheck. this makes the below check fail always on
++dnl systems with floor in -lm. thus we unset the chached result.
++unset ac_cv_func_floor
++AC_CHECK_FUNCS([ceil floor round])
+ 
+ # Look for tgetent
+ 
+--- vte-0.26.2.orig/configure	2012-04-30 20:02:55.000000000 +0200
++++ vte-0.26.2/configure	2012-04-30 20:03:16.000000000 +0200
+@@ -13277,7 +13277,7 @@
+ 
+ fi
+ 
+-for ac_func in ceil floor
++for ac_func in ceil floor round
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+diff -ru vte-0.26.2.orig/src/vte.c vte-0.26.2/src/vte.c
+--- vte-0.26.2.orig/src/vte.c	2011-08-17 08:30:58 +0200
++++ vte-0.26.2/src/vte.c	2011-08-17 08:38:09 +0200
+@@ -63,6 +63,18 @@
+ #include <locale.h>
+ #endif
+ 
++#ifndef HAVE_ROUND
++# if defined(HAVE_CEIL) && defined(HAVE_FLOOR)
++static inline double round(double x) {
++	if(x - floor(x) < 0.5) {
++		return floor(x);
++	} else {
++		return ceil(x);
++	}
++}
++# endif
++#endif
++
+ #if GTK_CHECK_VERSION (2, 90, 7)
+ #define GDK_KEY(symbol) GDK_KEY_##symbol
+ #else
diff --git a/x11-libs/vte/vte-0.28.2-r203.ebuild b/x11-libs/vte/vte-0.28.2-r203.ebuild
index 19d9a753008c..74607a91999f 100644
--- a/x11-libs/vte/vte-0.28.2-r203.ebuild
+++ b/x11-libs/vte/vte-0.28.2-r203.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.28.2-r203.ebuild,v 1.10 2012/07/15 18:42:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.28.2-r203.ebuild,v 1.11 2012/07/30 13:51:56 ottxor Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -14,7 +14,7 @@ HOMEPAGE="http://git.gnome.org/browse/vte"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-linux ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="debug doc glade +introspection python"
 
 PDEPEND="x11-libs/gnome-pty-helper"
@@ -46,6 +46,14 @@ pkg_setup() {
 		$(use_enable introspection)
 		$(use_enable python)
 		--with-gtk=2.0"
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		G2CONF="${G2CONF} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 	if use python; then
 		python_set_active_version 2
@@ -56,6 +64,8 @@ pkg_setup() {
 src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=663779
 	epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
+	# https://bugzilla.gnome.org/show_bug.cgi?id=652290
+	epatch "${FILESDIR}"/${PN}-0.28.2-interix.patch
 
 	gnome2_src_prepare
 }
diff --git a/x11-libs/vte/vte-0.32.2.ebuild b/x11-libs/vte/vte-0.32.2.ebuild
index e4307d418435..98bbbee45974 100644
--- a/x11-libs/vte/vte-0.32.2.ebuild
+++ b/x11-libs/vte/vte-0.32.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.32.2.ebuild,v 1.1 2012/06/16 10:48:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.32.2.ebuild,v 1.2 2012/07/30 13:51:56 ottxor Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="http://git.gnome.org/browse/vte"
 
 LICENSE="LGPL-2"
 SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~alpha"
 IUSE="debug doc glade +introspection"
 
 PDEPEND="x11-libs/gnome-pty-helper"
@@ -43,6 +43,14 @@ pkg_setup() {
 		$(use_enable debug)
 		$(use_enable glade glade-catalogue)
 		$(use_enable introspection)"
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		G2CONF="${G2CONF} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 }