Fixed build when CLIB is set (bug #353719)

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 46 insertions, 4 deletions

diff --git a/dev-libs/libmix/ChangeLog b/dev-libs/libmix/ChangeLog
index 0aae3f833d08..052ac6a71b29 100644
--- a/dev-libs/libmix/ChangeLog
+++ b/dev-libs/libmix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libmix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/ChangeLog,v 1.15 2011/02/06 12:38:27 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/ChangeLog,v 1.16 2011/03/21 12:55:16 angelos Exp $
+
+  21 Mar 2011; Christoph Mende <angelos@gentoo.org> libmix-2.05-r5.ebuild,
+  +files/libmix-2.05-gentoo2.patch:
+  Fixed build when CLIB is set (bug #353719)
 
   06 Feb 2011; Mart Raudsepp <leio@gentoo.org> libmix-2.05.ebuild:
   Drop to ~mips
diff --git a/dev-libs/libmix/Manifest b/dev-libs/libmix/Manifest
index 384a7f94c4e1..72b49406d1bf 100644
--- a/dev-libs/libmix/Manifest
+++ b/dev-libs/libmix/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libmix-2.05-fix-pattern.patch 415 RMD160 36e580101f9b0c072ee95c83945e3a0b976048c6 SHA1 128873f9a7a708ea4e245887ebae997972390079 SHA256 7924d3e439ef17d374a1bb6846e8074f416af64a9e35277bfee2e37ab6f4aab9
 AUX libmix-2.05-gentoo.patch 8398 RMD160 75d016fb56e87ce1406cc70c206d1960e3ce7921 SHA1 d535caba59eade1d6cacf669afd21a12e0c58759 SHA256 ac0e77f791fb470d0eb0615d6317c5847727747a564a68d7dfb61eb262fa981a
+AUX libmix-2.05-gentoo2.patch 789 RMD160 da09496c8907bad6ab87360ce83dc506fd0dc837 SHA1 34a702b755f8bf2713e936ae2276c17495616782 SHA256 e8a2d227534a76295fd5a1d440adaabf1d2ca54b82021d143e4f1af7e25ca36c
 AUX libmix-2.05-libnet.patch 509 RMD160 d998a9fd911bd2e6f4cbcd9997e20e67c0e1ec5b SHA1 80ccaef2bb94225943fcd9b09c7c322d88051255 SHA256 894bfd14719182b540be4e3c127a2a371fae590206e46e001c013fd105c6b4e4
 DIST libmix-205.tgz 79860 RMD160 7b08dbd54979480c3b9e6664a43d7a6d02c3fb85 SHA1 554bb0a7c77e8ebf2f56769c22a304ea46537d7c SHA256 7d2ca949652137c20fdf1cb87482f92bdbeef403cd832a8597e747d8651137c6
-EBUILD libmix-2.05-r5.ebuild 1120 RMD160 4f2fadaaf3fde0f492e14d0c16b5500b6560d3b7 SHA1 898bae32984e8592118e284f4cb17fa46c03a92d SHA256 d7ab8a21b34dca9eb3ddba1538f8de1655e5adfb220ea372835603dcd27dcd63
+EBUILD libmix-2.05-r5.ebuild 1151 RMD160 701a1eb5d14459a7862ef662b5534e96592d846f SHA1 7f343395126615c1c61acf1f89232079191cfa87 SHA256 1caaa32a9337907c9cb89f013ec5e194d33ebde0f9bd7fbb4b3f3dddbe7f6bf7
 EBUILD libmix-2.05.ebuild 941 RMD160 86ff5e9542c976a5b48df1a44b321d1f63b8ea08 SHA1 9c6a96f190534c42ba09c4cf39dfa9efd4228d3e SHA256 01d8a3e56e11c6f4b16e64c864a66706d289669983ed561e6e2f7567ed0beb8e
-MISC ChangeLog 2631 RMD160 482a6b801ab58648226d6db302296142ccd5c743 SHA1 bd50775b411888ed18bb2d92babdf539e9db363f SHA256 6f9168d349d921bae08043b6ea04e4a1ad55eefd0744475d658c0cb1650f8e35
+MISC ChangeLog 2791 RMD160 ae5d79daeed814fdb537f749ee6168e7cbdf8aa4 SHA1 cb975fa0cdd72aacd09c643b83aa0da9493f7d91 SHA256 3946d6bdcbe638efe57bc7e46626b9bf26a6c8f83e6eb5e48b952f8ff2e0d6cb
 MISC metadata.xml 358 RMD160 45e29ac813927bbc65c4869d2864e7b0d8293076 SHA1 752dc3105aed16670a3e664e91fdba03fd8c5c96 SHA256 13d1892a652676ec081ddb747a5307ae1d9c1c7c8246aecc38d9b58a74ad86ee
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk2HSp4ACgkQmWq1bYTyC0NKJQD/RP8LU7+B3gcnEDmwxp8Z49zk
+nWJgpzWtktqnIS8vJ2IA/0xalduWGZ7uJgUOc+RY/jYCQBeQiYfvdQ0FgNO0ef2V
+=Hme0
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libmix/files/libmix-2.05-gentoo2.patch b/dev-libs/libmix/files/libmix-2.05-gentoo2.patch
new file mode 100644
index 000000000000..41efcc56eca2
--- /dev/null
+++ b/dev-libs/libmix/files/libmix-2.05-gentoo2.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile.in b/Makefile.in
+index 434b8e5..a384b50 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -54,7 +54,7 @@ libmix++.a: mix/net.h $(OBJS_PP_A)
+ 	${RANLIB} libmix++.a
+ 
+ libtest: libtest.o
+-	$(CXX) $(CXXFLAGS) $(CCOPTS) -static -I. -L. libtest++.o -o libtest -lmix++  ${CLIB}
++	$(CXX) $(CXXFLAGS) $(CCOPTS) -static -I. -L. libtest++.o -o libtest -lmix++  $(CLIB)
+ 
+ libtest.o:
+ 	$(CC) $(CCOPTS) $(CFLAGS) -c libtest.c -o libtest.o
+diff --git a/configure.in b/configure.in
+index 55fb7dd..e9bd924 100644
+--- a/configure.in
++++ b/configure.in
+@@ -28,7 +28,7 @@ AC_ARG_WITH([net2],
+ AS_IF([test "x$with_net2" = "xyes"], [
+   AC_DEFINE(LM_USE_NET2)
+   CLIB="-lnet-1.0 -lpcap"
+-])
++], [CLIB=""])
+ 
+ AC_ARG_ENABLE([static],
+ 	AS_HELP_STRING([--enable-static], [Build static libs]))
diff --git a/dev-libs/libmix/libmix-2.05-r5.ebuild b/dev-libs/libmix/libmix-2.05-r5.ebuild
index f9c308e1d8ec..c7e910b014f3 100644
--- a/dev-libs/libmix/libmix-2.05-r5.ebuild
+++ b/dev-libs/libmix/libmix-2.05-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/libmix-2.05-r5.ebuild,v 1.1 2011/01/23 10:32:25 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/libmix-2.05-r5.ebuild,v 1.2 2011/03/21 12:55:16 angelos Exp $
 
 EAPI="2"
 
@@ -25,6 +25,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix-pattern.patch
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-libnet.patch
+	"${FILESDIR}"/${P}-gentoo2.patch
 )
 
 DOCS=( CHANGES )