Fix glibc 2.8 build, thanks to Gene Seto for the required patch. Version bump as well

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

8 files changed, 45 insertions, 144 deletions

diff --git a/net-libs/gloox/ChangeLog b/net-libs/gloox/ChangeLog
index 80ebf41822e7..5f82071d3747 100644
--- a/net-libs/gloox/ChangeLog
+++ b/net-libs/gloox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/gloox
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/ChangeLog,v 1.9 2008/04/21 19:40:04 jokey Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/ChangeLog,v 1.10 2009/01/31 21:33:45 jokey Exp $
+
+*gloox-1.0_beta4 (31 Jan 2009)
+
+  31 Jan 2009; <jokey@gentoo.org> +files/gloox-0.9.9.5-gcc43.patch,
+  -gloox-0.8.4.ebuild, -gloox-0.9.9.3.ebuild, -gloox-0.9.9.4.ebuild,
+  gloox-0.9.9.5.ebuild, -gloox-1.0_beta2.ebuild, +gloox-1.0_beta4.ebuild:
+  Fix glibc 2.8 build, thanks to Gene Seto for the required patch. Version
+  bump as well
 
 *gloox-1.0_beta2 (21 Apr 2008)
 
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index cca542e19715..4fe8e54ba9ab 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,25 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX gloox-0.9.9.5-gcc43.patch 618 RMD160 d975d684e180731e940e2d5e03366b07065f1342 SHA1 407b77073f2348a8501b0b9ca4e2cb56b374d593 SHA256 8ee09d27f131125d638cdb37b83f48f363e0b1180045aafa6887a7cfea4df48a
 AUX gloox-res_query-check.patch 566 RMD160 0d4c2091556dd516ec43c97ff2eb475da0e95357 SHA1 ebba1b6ce89f15745c5a6973d8ad5165c22863be SHA256 9c49803fbb75513bc60372b1dc264c6051432c537dfdbd6306ae6ef95d624bd5
-DIST gloox-0.8.4.tar.bz2 322025 RMD160 989560053b334332d7763b1196a06678204b2d59 SHA1 ae35ce4e9268d6a2af26f45eadd478b9e343f81e SHA256 f85655280d6244567ac8af51e16d84d3086e605162d06dd4d16be33f564ea7c5
 DIST gloox-0.9.8.tar.bz2 438638 RMD160 413fd04581da13cd443a40d9e7fc51e90cbe0461 SHA1 03af5a5525bc014a6d84b5c92bfd4a2a12ec50a6 SHA256 d253ef7f3eb1eb9f7a1fe5263cb09b439b35567d1628c8b050e71ce5220cbf2a
-DIST gloox-0.9.9.3.tar.bz2 438578 RMD160 82e56921e3bce230944db962097ce8af92ff8e83 SHA1 5846036b9d77e3ee43416c253403070246199302 SHA256 f26d5121f9ebec75f6233efa0225277e351149a76eba66d15ec938b345033c1e
-DIST gloox-0.9.9.4.tar.bz2 438928 RMD160 e8df988f383a544378ac54e0566856d137838c02 SHA1 b730f80e3fb4ccecc3f13d7dd47d1432f55d945d SHA256 ae952643652b32c0b6452fac99c9a5a9e9f14b79077e143ec218285a5a59eab9
 DIST gloox-0.9.9.5.tar.bz2 439468 RMD160 e217ef6d84881923ad3bee3fd18e1bee357db5d3 SHA1 b8196d918a23ec519dac101c6e97321506247c3a SHA256 feffed16209fc109dc2e2d06a42e8d00942e9a00bcae0ee23abcf6a9b07923c4
-DIST gloox-1.0-beta2.tar.bz2 520256 RMD160 3bc272730ae6ec076062aa143df5d31a2d3886b2 SHA1 b37f4485561712c3f1c7b740d23c830ddc180c01 SHA256 a7ca51fa92d11d33d196cca63998fa695ffd8c66c75a517e8cb08c58982ae4bf
-EBUILD gloox-0.8.4.ebuild 924 RMD160 14ff916c2a197c1efbe74bb96a9561aca964287c SHA1 3cc349fed5e811260a59932adf2291e2faf94608 SHA256 2e1a505983c6b09541f3c4597763369a90a7adba1f9cd35861f919a0fcd49340
+DIST gloox-1.0-beta4.tar.bz2 566298 RMD160 ec660c71961a6c870cc59104ae14e4af7b35dd8f SHA1 feb0a9d630006532a5f8ade985a3b6d6a01e8a29 SHA256 592be44c6f4ac20e2c0d69e1f460184905816decf73fe22d31a7a9d0997a20fe
 EBUILD gloox-0.9.8.ebuild 907 RMD160 9abd38c71d34e4e37df03a2dcb9741ccfb63d84e SHA1 a512f1ec2f794df6f29cb53ecf68ca62db2d92bb SHA256 be309d863479854589c61861cd67d3940b7bd36d5b8157e5dd58b483c93a4a4f
-EBUILD gloox-0.9.9.3.ebuild 917 RMD160 5644044935c0b7c9f13c479a3c3c390e78621fcd SHA1 a9d3bd7087d3b5792174758f7a062f5fb3e867cc SHA256 d605b49d2eb8370f0f8d36382c6d3f58de6e7c61f1ad6596feda8d750ba82148
-EBUILD gloox-0.9.9.4.ebuild 1048 RMD160 df364dc9a113780515e3cc65c7ed6a0bac24babd SHA1 7bab8b7af6ed5f3f5e091e543ea6ca69386e1eee SHA256 22756c587d346235e59f0605888823825784746d7373333d6abd35a8ea8cead7
-EBUILD gloox-0.9.9.5.ebuild 936 RMD160 04bb68d2fff8984317422b90678e4c98885cf43f SHA1 2a6f1393c92a2d6f7973dc2a4f5366e7ce78f870 SHA256 7ff81891dcb9fac45acaf22bd5675a5b570e85571751f591d334e259795fa122
-EBUILD gloox-1.0_beta2.ebuild 947 RMD160 3c1c14bba41ae32a2460c1369c0558a382301bf3 SHA1 c763a1a77d90679605d926d241a823c533c44ea1 SHA256 afa71207e4056b76d2b69ded463e3b791458c5a833bc713f8b08d0164c0de9d2
-MISC ChangeLog 1468 RMD160 4bdaa7d3c906edeec6fccd94e560bc8e4a575c46 SHA1 b1aed9dba8274047fa14cea36ccdcd1252162efc SHA256 d755782775f357c91098c6a30b75d1b22bc3253a424ef263a3ebfc20fee1971f
+EBUILD gloox-0.9.9.5.ebuild 982 RMD160 c714df67c618a424e4b4bd7016ef3cc7c9241400 SHA1 4e629a2df1d3039e8648ab6f50c213800826d1c6 SHA256 f1a4c46c04b87b325f1ae3ffc1c9f71d67e93ddddcca8ca65cbf164ad5be77cf
+EBUILD gloox-1.0_beta4.ebuild 926 RMD160 b43139f7af7de5d95e45cc7292f83758c3031533 SHA1 d63bf2e61e9affcf7062179d7091b0f00366b5ce SHA256 d7a02b11db63c682bbd1d4302e0a7a89e2421f08d282ee3c2fa67b85416a9f51
+MISC ChangeLog 1803 RMD160 96e7552991f68101b6d62901fd6f7ff3e21c2e51 SHA1 0ee162c7fc4f3f6732d29b816a8e374b2be1014a SHA256 ad385596fe41f04d8d860fb9758ecd6fb9caeacfb3f59c93d44674c2039673ae
 MISC metadata.xml 250 RMD160 b6e51a264e1584f783bd491505e99523d2ea6ebf SHA1 adf080dc000855fff7cb5595582e3b1acfe62dca SHA256 9f906a6688066a1ded86eb663ff87e162ac0d2e4c02a22f73fc158323bec0a61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgM7ZoACgkQz974XjDVpbm7EgCgyxMhxufYr4kM2Y+fTr5Qa9m7
-KiUAoN8nORqzoAgX28o+NbwXmHgXriSu
-=PDn8
------END PGP SIGNATURE-----
diff --git a/net-libs/gloox/files/gloox-0.9.9.5-gcc43.patch b/net-libs/gloox/files/gloox-0.9.9.5-gcc43.patch
new file mode 100644
index 000000000000..0fa4fd465121
--- /dev/null
+++ b/net-libs/gloox/files/gloox-0.9.9.5-gcc43.patch
@@ -0,0 +1,12 @@
+--- gloox-0.9.9.5b/src/tlsopenssl.cpp	2009-01-21 22:43:06.000000000 -0400
++++ gloox-0.9.9.5/src/tlsopenssl.cpp	2009-01-22 00:42:53.000000000 -0400
+@@ -223,7 +223,8 @@
+       m_certInfo.date_to = openSSLTime2UnixTime( (char*)(peer->cert_info->validity->notAfter->data) );
+       std::string p;
+       p.assign( peer_CN );
+-      std::transform( p.begin(), p.end(), p.begin(), std::tolower );
++      /* http://lists.debian.org/debian-gcc/2002/04/msg00092.html */
++      std::transform( p.begin(), p.end(), p.begin(), (int(*)(int))std::tolower );
+       if( p != m_server )
+         m_certInfo.status |= CertWrongPeer;
+ 
diff --git a/net-libs/gloox/gloox-0.8.4.ebuild b/net-libs/gloox/gloox-0.8.4.ebuild
deleted file mode 100644
index f2a2141fa7f3..000000000000
--- a/net-libs/gloox/gloox-0.8.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/gloox-0.8.4.ebuild,v 1.1 2007/10/22 21:43:59 jokey Exp $
-
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="http://camaya.net/gloox"
-SRC_URI="http://camaya.net/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gnutls idn ssl zlib"
-
-DEPEND="idn? ( >=net-dns/libidn-0.5.0 )
-	gnutls? ( >=net-libs/gnutls-1.2.0 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	zlib? ( sys-libs/zlib )
-	dev-libs/iksemel"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf \
-		$(use_enable debug debug) \
-		$(use_with idn libidn) \
-		$(use_with gnutls gnutls) \
-		$(use_with ssl openssl) \
-		$(use_with zlib zlib) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-libs/gloox/gloox-0.9.9.3.ebuild b/net-libs/gloox/gloox-0.9.9.3.ebuild
deleted file mode 100644
index ebd1e280975c..000000000000
--- a/net-libs/gloox/gloox-0.9.9.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/gloox-0.9.9.3.ebuild,v 1.1 2008/03/04 20:13:32 jokey Exp $
-
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="http://camaya.net/gloox"
-SRC_URI="http://camaya.net/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gnutls idn ssl zlib"
-
-DEPEND="idn? ( >=net-dns/libidn-0.5.0 )
-	gnutls? ( >=net-libs/gnutls-1.2.0 )
-	ssl? ( >=dev-libs/openssl-0.9.8 )
-	zlib? ( >=sys-libs/zlib-1.2.3 )"
-
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf \
-		$(use_enable debug debug) \
-		$(use_with idn libidn) \
-		$(use_with gnutls gnutls) \
-		$(use_with ssl openssl) \
-		$(use_with zlib zlib) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-libs/gloox/gloox-0.9.9.4.ebuild b/net-libs/gloox/gloox-0.9.9.4.ebuild
deleted file mode 100644
index 7dfddc0d035a..000000000000
--- a/net-libs/gloox/gloox-0.9.9.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/gloox-0.9.9.4.ebuild,v 1.1 2008/03/18 21:15:42 jokey Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="http://camaya.net/gloox"
-SRC_URI="http://camaya.net/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gnutls idn ssl zlib"
-
-DEPEND="idn? ( >=net-dns/libidn-0.5.0 )
-	gnutls? ( >=net-libs/gnutls-1.2.0 )
-	ssl? ( >=dev-libs/openssl-0.9.8 )
-	zlib? ( >=sys-libs/zlib-1.2.3 )"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-res_query-check.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable debug debug) \
-		$(use_with idn libidn) \
-		$(use_with gnutls gnutls) \
-		$(use_with ssl openssl) \
-		$(use_with zlib zlib) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-libs/gloox/gloox-0.9.9.5.ebuild b/net-libs/gloox/gloox-0.9.9.5.ebuild
index bdef351f11fc..cf791ab6b2bd 100644
--- a/net-libs/gloox/gloox-0.9.9.5.ebuild
+++ b/net-libs/gloox/gloox-0.9.9.5.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/gloox-0.9.9.5.ebuild,v 1.1 2008/04/21 19:05:36 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/gloox-0.9.9.5.ebuild,v 1.2 2009/01/31 21:33:45 jokey Exp $
 
-inherit autotools
+EAPI=2
+
+inherit autotools eutils
 
 DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
 HOMEPAGE="http://camaya.net/gloox"
@@ -20,7 +22,11 @@ DEPEND="idn? ( >=net-dns/libidn-0.5.0 )
 
 RDEPEND="${DEPEND}"
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
+src_configure() {
 	econf \
 		$(use_enable debug debug) \
 		$(use_with idn libidn) \
@@ -28,7 +34,6 @@ src_compile() {
 		$(use_with ssl openssl) \
 		$(use_with zlib zlib) \
 		|| die "econf failed"
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/net-libs/gloox/gloox-1.0_beta2.ebuild b/net-libs/gloox/gloox-1.0_beta4.ebuild
index 95dd1fb0cad6..54b6ac9a2e7e 100644
--- a/net-libs/gloox/gloox-1.0_beta2.ebuild
+++ b/net-libs/gloox/gloox-1.0_beta4.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/gloox-1.0_beta2.ebuild,v 1.1 2008/04/21 19:40:04 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/gloox-1.0_beta4.ebuild,v 1.1 2009/01/31 21:33:45 jokey Exp $
+
+EAPI=2
 
 inherit autotools
 
+MY_P=${P/_/-}
 DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
 HOMEPAGE="http://camaya.net/gloox"
-SRC_URI="http://camaya.net/download/${PN}-1.0-beta2.tar.bz2"
+SRC_URI="http://camaya.net/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,9 +23,9 @@ DEPEND="idn? ( net-dns/libidn )
 
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}-1.0-beta2
+S=${WORKDIR}/${MY_P}
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable debug debug) \
 		$(use_with idn libidn) \
@@ -30,7 +33,6 @@ src_compile() {
 		$(use_with ssl openssl) \
 		$(use_with zlib zlib) \
 		|| die "econf failed"
-	emake || die "emake failed"
 }
 
 src_install() {