Fixed test building on OpenSolaris issue, bug #239020.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 35 insertions, 4 deletions

diff --git a/dev-libs/confuse/ChangeLog b/dev-libs/confuse/ChangeLog
index c0fcb461ea1b..4c2a7bc0cf26 100644
--- a/dev-libs/confuse/ChangeLog
+++ b/dev-libs/confuse/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/confuse
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/ChangeLog,v 1.33 2008/09/15 01:40:47 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/ChangeLog,v 1.34 2008/09/30 23:35:50 matsuu Exp $
+
+*confuse-2.6-r3 (30 Sep 2008)
+
+  30 Sep 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/confuse-2.6-solaris.patch, -confuse-2.6-r1.ebuild,
+  +confuse-2.6-r3.ebuild:
+  Fixed test building on OpenSolaris issue, bug #239020.
 
 *confuse-2.6-r2 (15 Sep 2008)
 
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index 87843a18d3e9..9b401ce59924 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,7 +1,8 @@
 AUX confuse-2.6-O0.patch 492 RMD160 29fd2ba5a9c2fec7d23f1586b25de4fdda30e720 SHA1 1a6c59611dd013e429e44ebf886a60e0a30ecec1 SHA256 64a6d0df44f72d3f514a4678a16f1f887e417250f7990b64631fe0a3999215ff
+AUX confuse-2.6-solaris.patch 572 RMD160 e43927f1688fb99e283d919b4d6f7bce7de18bb2 SHA1 bbe8a4071c8961b965cd37f2ce9b295ff17129dc SHA256 00dc757a617db9fc5832ec4435ef581b49286621cf300a89b318151a1bfd15c5
 DIST confuse-2.6.tar.gz 504017 RMD160 11f987089c533573482a427c7ad2ae8e155389b7 SHA1 e9e5510abf1eb3159a6439fd52aa5cec94811aff SHA256 e8d653159b152f3850a7224b3eb604955795dbd3fd6603816ee46411ea53e84a
-EBUILD confuse-2.6-r1.ebuild 920 RMD160 1a0a0614224961e1330ba42598c29f2d43dbf976 SHA1 089b7dc625bcdec328d908ece9536af6bc61ab19 SHA256 ef30bed8430d723dcddbdeb575f3950a23a0acea765ce843f0546c3b6f5c958d
 EBUILD confuse-2.6-r2.ebuild 987 RMD160 2d3d6b6d2a304579dd74ff780865342b7f297fe0 SHA1 3ffb982ba4563906d7276a5ad32a95d127cb0515 SHA256 012e6071397c448e059fdac7ee77857e4801d5ebf2553a9548a53629e42ee686
+EBUILD confuse-2.6-r3.ebuild 1042 RMD160 8495896c29d23ff37f6ff66e7b70850689b52cda SHA1 33b92793721098ee88218ac02adbcd94217a3ac3 SHA256 a1ceab4d015e8674bd07bed3a60a06baca5d0bc16dd1f91f0d19f411ecc768a9
 EBUILD confuse-2.6.ebuild 819 RMD160 bbf93fd148a905484c1536a5948fe081cb31b537 SHA1 d7436dd05ac2852d4299b022fe70a835beba13f9 SHA256 883cf1aa30b568eb87b7eabb390b29e2f161e8586dd6641638794ff555d1f046
-MISC ChangeLog 4149 RMD160 27e125c2dcf5acf5ecdb1c72bfa6fc960d563e01 SHA1 0600c88438e5c4e93c54c106e48eebe42fea873f SHA256 7275ccbc14b169b527c62a4fc3dcecb378cc0ac758d4aa7755b34ccf36cd8583
+MISC ChangeLog 4373 RMD160 9f391a4947141ffcd07d951d2c96c29121bc9c42 SHA1 5588661d4883c22dcd3bc0cc3491a71b226c301a SHA256 c1aa2fa4f8636e1dfc25d29fb85daa7087c1f4e65539d519515c01da9baf0a6e
 MISC metadata.xml 222 RMD160 23efe87c16ebc9fbeb91e894ab372cc3bb66bc49 SHA1 a5d1e2317ae207bbd664aebe986687948fdd984a SHA256 38ef3457fd14e6872985f0e100fde79d0b8a9dbc4fc39ceef780c8c5abc5f337
diff --git a/dev-libs/confuse/confuse-2.6-r1.ebuild b/dev-libs/confuse/confuse-2.6-r3.ebuild
index 2edb43c46e31..f6aed2b80f27 100644
--- a/dev-libs/confuse/confuse-2.6-r1.ebuild
+++ b/dev-libs/confuse/confuse-2.6-r3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/confuse-2.6-r1.ebuild,v 1.2 2008/05/17 03:07:07 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/confuse-2.6-r3.ebuild,v 1.1 2008/09/30 23:35:50 matsuu Exp $
+
+inherit eutils
 
 DESCRIPTION="a configuration file parser library"
 HOMEPAGE="http://www.nongnu.org/confuse/"
@@ -20,6 +22,10 @@ RDEPEND="nls? ( virtual/libintl )"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	# bug #236347
+	epatch "${FILESDIR}"/${P}-O0.patch
+	# bug 239020
+	epatch "${FILESDIR}"/${P}-solaris.patch
 	# drop -Werror, bug #208095
 	sed -i -e 's/-Werror//' */Makefile.* || die
 }
diff --git a/dev-libs/confuse/files/confuse-2.6-solaris.patch b/dev-libs/confuse/files/confuse-2.6-solaris.patch
new file mode 100644
index 000000000000..21c42125306e
--- /dev/null
+++ b/dev-libs/confuse/files/confuse-2.6-solaris.patch
@@ -0,0 +1,17 @@
+Index: configure.ac
+===================================================================
+RCS file: /sources/confuse/confuse/configure.ac,v
+retrieving revision 1.18
+diff -u -B -r1.18 configure.ac
+--- configure.ac	13 Oct 2007 15:02:52 -0000	1.18
++++ configure.ac	29 Sep 2008 10:13:10 -0000
+@@ -39,6 +39,9 @@
+ # Checks for library functions.
+ AC_CHECK_FUNCS([strcasecmp strdup strndup])
+ 
++dnl Check for the library containing inet_aton/inet_ntoa (for tests)
++AC_SEARCH_LIBS([inet_ntoa], [socket nsl])
++
+ AC_CONFIG_FILES([Makefile \
+ 		 src/Makefile \
+ 		 examples/Makefile \