Import gentoo-prefix support from the prefix-overlay, including bump to EAPI=3, for xchat-2.8.8-r2.

Package-Manager: portage-2.2.0_alpha41-r1/cvs/Linux x86_64

4 files changed, 54 insertions, 11 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 5cc297be4040..310a4d1e4734 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.297 2011/03/29 12:50:37 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.298 2011/07/02 06:13:22 binki Exp $
+
+  02 Jul 2011; Nathan Phillip Brink <binki@gentoo.org>
+  +files/xchat-2.8.4-interix.patch, xchat-2.8.8-r2.ebuild:
+  Import gentoo-prefix support from the prefix-overlay, including bump to
+  EAPI=3, for xchat-2.8.8-r2.
 
   29 Mar 2011; Christoph Mende <angelos@gentoo.org> xchat-2.8.6-r2.ebuild:
   Fix gtk+ slot deps
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 81d333ebb83f..9e1c692d8a18 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX xc286-smallfixes.diff 2020 RMD160 91c654320b7b1f9d6b13f7b226fb4cec26054319 SHA1 b13eb421f6d72fca195b398c606d9413aec57fc4 SHA256 08c31e4d8d792f101047362cb25c529389c9fa254e2139a678491ee4e1fe58ff
+AUX xchat-2.8.4-interix.patch 544 RMD160 01c3dbe26226e0efb41c3cf2177e86bc59d26ba5 SHA1 ef52dd70c75a52ac3c22f0eea0d7a4e403c04754 SHA256 d782b7480f370d6082ad47d571c4bb1278d8d00d203880933837e1cf8b424fe9
 AUX xchat-2.8.6-shm-pixmaps.patch 2711 RMD160 0052d6981752d19cf4876180f00a57b4c503f0c8 SHA1 3731d5c7ac04f053da923406fc73df37ff7802df SHA256 984174ea711fbb7b2d7817e838fb5ad54f4c414ca5f6004994f15bf790279060
 AUX xchat-2.8.8-libnotify07.patch 1705 RMD160 7e18b5dc3b0ca420d50f349b860f516f53c7a780 SHA1 fab2c7053b5889d7a0aa65a25a3bda2958c47125 SHA256 dc63ab7c32091a02b3c3a3e743ab209be52d584b75b577b55d9859a8f9dac0e0
 AUX xchat-input-box4.patch 1116 RMD160 a5f51ab0505b3f9724a7be6ed0199b60e94b6189 SHA1 055270f24defcdc327292bafb06ad21b8a4230e5 SHA256 a9f2e833afe4066d0e1e9f404eae79c90caa9c0a6a53c5201e6d3498a6ad3b6b
@@ -11,13 +12,24 @@ DIST xchat-dccserver-0.6.patch.bz2 49320 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257
 DIST xchat_irc_icon_by_half_left-d3bjxuo.zip 71179 RMD160 8ef69f0b38ab9327e860829b4d72c1eead16dfe9 SHA1 200985a88b7a7bd51ccc2efdba521e3f373162f5 SHA256 1005f40a375da6806700485cd4db4a8681cd141020e9102e92f8ada075e7bf6b
 EBUILD xchat-2.8.6-r2.ebuild 2820 RMD160 481d2d4473a694624d8efea25060c437f5b764d5 SHA1 84d28917226ec041bf75e2e20c95ae77590202ba SHA256 2ee299e5405af604fd84b136e57224a9d58b561c4d5ee200bc7d06e5fe94e14b
 EBUILD xchat-2.8.8-r1.ebuild 2827 RMD160 f635ba51b98c9cae7d4172aa1b1b7cb6b305be18 SHA1 dc113c468fb1b11aadbec1592df64ff37f5604ff SHA256 4956ed377e28037e14cca87c6097951ba83d674e83d7d519c3d2ce0ea61e40f0
-EBUILD xchat-2.8.8-r2.ebuild 3365 RMD160 a980d4f4a0945c4f6d801bbb88707494170ca5e8 SHA1 7a1a38a62ce46101de71fb7b6f8c47b5d7e21f68 SHA256 f37290dd1de0893640bf605d9e1d7618d51c0086312f7a94b145984573d938cc
-MISC ChangeLog 44483 RMD160 28360795abeff0e4561416c99c8d1203814dd060 SHA1 d57ba9ba5b5b2b6b29737daa519f68bd6a2ca035 SHA256 b94f275dd7a2cd773393460de1c3f55b717e2c4f94141f0b0c9706bfe4921994
+EBUILD xchat-2.8.8-r2.ebuild 3701 RMD160 ffa9bb3752cc78096248b333fca3370d0a7bd869 SHA1 01d1e7a26d2d104c543677955f58c6160f6dd031 SHA256 f82435f39c6787629fe2bcaee462e2ea6c12e5881c27f46bd06d4f8290a12558
+EBUILD xchat-2.8.8.ebuild 2784 RMD160 a0df950aa08c3605e2c0ba7ff03d4ce8d37f1aa4 SHA1 8f5571be458457edc4d7bff7c8ae4e572481e23f SHA256 0046c33a38d0ef1e4f311961ae0286092ffa83c4f2aa0d169814507df5160a79
+MISC ChangeLog 44700 RMD160 929fe02d455bf49094b45c501efdd6e845241214 SHA1 16067a98fd51b81d9c17713e482a6da2c4147cf1 SHA256 40497ec771ca2033aa96b89030b33a1ae2459548c2243801fa829759523c68b0
 MISC metadata.xml 712 RMD160 6eafa9bf2fe298a612764b37b39a007b38697862 SHA1 1ee0d2206d19cce1955d2acef6022e6d32069790 SHA256 a92843c55c72b49ed2b0b282ed989ea4a58b81629f26ecd7e6320bd4c5531723
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAk2R1aIACgkQmWq1bYTyC0NdEQD/ZM0ktvlWK31i4H9AufPM2cn8
-aBoVWGTbUXnJmC4ONfgA/0dVbRxRjE0t+5p2/elEDcaQWIlumwg1lx3KhY2y6Q5C
-=UzvT
+iQIcBAEBCAAGBQJODrdAAAoJEHQ6UuhrqBBQIIMP/ApQJxzYqMTJN3IxMt0BnfXJ
+nYfeq6TJEpIk4e3Z23zjgcC611kdPaiASLP19pdZs+gu7CPceebFT5C/4o6UUTUw
+b+c0k1w1W5zHjwR9Hboz7b9RPLoMS1IV744bLwYhVQdJvPHNxz2Gv10ksmDgJnfV
+aESxeUct4gRELV7XBgOFujver7q7KH8JB6XB0cHm5Xb2zSjL1R3pwX0RXJObkscV
+jTjKcCuZqI19Pc08CnRmTXIU3dT5pSmgaQ6n0yHdbcgWyEUk35UqkGgCA0MFNooi
+5AYQ4aboVVo0E9DCword5UrnU7QQYjL15Q/V9arYgXb4xwepeYcLGxdmjn8J4Gyu
+8w/4ORZJK4PLYogpNmCyZOcHqptQyib4lbFFVBMIgdoAmiz5V9qu+z2RcMuqvweM
+mxvDM07LtmoJms50DT8ZHDSSET8/Mwfh3xbEh7YCkSNyJe8H+vdxQ2ypWeZ/keA2
+MPdPCSxMgjDWV8c1OUXpKptld6b1cBvuc8RbDpqsnBd8Br5lDPnXgQuKfBzabxoR
+oJCq4pJBfbsTQVFMhcVuswyJGWPHAuj0uuXCdi5UHSDYv4NV/NNEehSkbeXnHimt
+qxJ3pzVfc0SfDB/GfoqapHDoq2HJOBUpK2LSNLwGf9q7EI25QAHCl5jFNVZUorFI
+RJqlnwN06kleXnQra8eg
+=s3TI
 -----END PGP SIGNATURE-----
diff --git a/net-irc/xchat/files/xchat-2.8.4-interix.patch b/net-irc/xchat/files/xchat-2.8.4-interix.patch
new file mode 100644
index 000000000000..ce4b76b1d52e
--- /dev/null
+++ b/net-irc/xchat/files/xchat-2.8.4-interix.patch
@@ -0,0 +1,18 @@
+diff -ru xchat-2.8.4.orig/src/common/text.c xchat-2.8.4/src/common/text.c
+--- xchat-2.8.4.orig/src/common/text.c	2008-03-12 14:45:26 +0100
++++ xchat-2.8.4/src/common/text.c	2008-03-12 15:04:35 +0100
+@@ -271,10 +271,14 @@
+ 	{
+ 		if (buf[0] == 'T')
+ 		{
++#ifdef HAVE_STRTOULL
+ 			if (sizeof (time_t) == 4)
+ 				stamp = strtoul (buf + 2, NULL, 10);
+ 			else
+ 				stamp = strtoull (buf + 2, NULL, 10); /* just incase time_t is 64 bits */
++#else
++			stamp = strtoul (buf + 2, NULL, 10);
++#endif
+ 			text = strchr (buf + 3, ' ');
+ 			if (text)
+ 			{
diff --git a/net-irc/xchat/xchat-2.8.8-r2.ebuild b/net-irc/xchat/xchat-2.8.8-r2.ebuild
index 5b6ba9a4b299..3b907f33b103 100644
--- a/net-irc/xchat/xchat-2.8.8-r2.ebuild
+++ b/net-irc/xchat/xchat-2.8.8-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.3 2011/03/22 09:54:15 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.4 2011/07/02 06:13:22 binki Exp $
 
-EAPI=2
+EAPI=3
 
 inherit eutils versionator gnome2 autotools
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.xchat.org/"
 
 LICENSE="GPL-2 hires-icons? ( GPL-3 )"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="dbus fastscroll +gtk hires-icons ipv6 libnotify mmx nls ntlm perl python spell ssl tcl xchatdccserver"
 
 RDEPEND=">=dev-libs/glib-2.6.0:2
@@ -45,6 +45,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-input-box4.patch
+	epatch "${FILESDIR}"/${PN}-2.8.4-interix.patch
 	epatch "${FILESDIR}"/${P}-libnotify07.patch
 
 	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
@@ -57,7 +58,7 @@ src_prepare() {
 
 	# xchat sourcecode ships with po/Makefile.in.in from gettext-0.17
 	# which fails with >=gettext-0.18
-	cp /usr/share/gettext/po/Makefile.in.in "${S}"/po/ || die
+	cp "${EPREFIX}"/usr/share/gettext/po/Makefile.in.in "${S}"/po/ || die
 
 	eautoreconf
 }
@@ -67,6 +68,13 @@ src_configure() {
 	# instead of python-config (#25943)
 	unset PYTHONPATH
 
+	if [[ ${CHOST} == *-interix* ]]; then
+		# this -Wl,-E option for the interix ld makes some checks
+		# false positives, so set those here.
+		export ac_cv_func_strtoull=no
+		export ac_cv_func_memrchr=no
+	fi
+
 	econf \
 		--enable-shm \
 		$(use_enable dbus) \