Clean up gentoo patch to set SONAME, but not diff from the files actually installed #390839 by Lars Wendler.

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

4 files changed, 345 insertions, 7 deletions

diff --git a/dev-libs/libmix/ChangeLog b/dev-libs/libmix/ChangeLog
index f60cf3f25048..ec34f325114e 100644
--- a/dev-libs/libmix/ChangeLog
+++ b/dev-libs/libmix/ChangeLog
@@ -1,6 +1,13 @@
 # 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.24 2011/05/21 21:56:39 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/ChangeLog,v 1.25 2011/11/17 21:08:07 vapier Exp $
+
+*libmix-2.05-r6 (17 Nov 2011)
+
+  17 Nov 2011; Mike Frysinger <vapier@gentoo.org> +libmix-2.05-r6.ebuild,
+  +files/libmix-2.05-gentoo-r1.patch:
+  Clean up gentoo patch to set SONAME, but not diff from the files actually
+  installed #390839 by Lars Wendler.
 
   21 May 2011; Christoph Mende <angelos@gentoo.org> -libmix-2.05.ebuild:
   Remove old
diff --git a/dev-libs/libmix/Manifest b/dev-libs/libmix/Manifest
index 562b2955232a..7003f5540941 100644
--- a/dev-libs/libmix/Manifest
+++ b/dev-libs/libmix/Manifest
@@ -2,19 +2,19 @@
 Hash: SHA256
 
 AUX libmix-2.05-fix-pattern.patch 415 RMD160 36e580101f9b0c072ee95c83945e3a0b976048c6 SHA1 128873f9a7a708ea4e245887ebae997972390079 SHA256 7924d3e439ef17d374a1bb6846e8074f416af64a9e35277bfee2e37ab6f4aab9
+AUX libmix-2.05-gentoo-r1.patch 8328 RMD160 f3553a6a8adc545e9c9fe769c0f7250af2255bcc SHA1 e59a7d40b08c187a812d2d7bbfa749631e862714 SHA256 0911b4c639c1da4f3adbb22021dcd3323f1b4bac6a45c2dc7cdedb386ad60876
 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 1143 RMD160 1ba06a87ed838bbcc1638a731b92cfe8aa140d07 SHA1 6922a79ac553fb39a7cbbf3174faaf8509a4c74d SHA256 28d904db97688a45e3403671ddff8d7c80926662a255951152787d2a61f65bc3
-MISC ChangeLog 3707 RMD160 857ae62bc532d0697394c8896fbb766a132edab4 SHA1 025a5150ab154afc164bd19d151eca00e3dfcc65 SHA256 0eeb8163276eb845531fd02d8f55bea25282fa90b63608d46b2432525ae04efe
+EBUILD libmix-2.05-r6.ebuild 1071 RMD160 2c041b1d66b0d8f3dd419b7e8c6a9ecc7b5f8a0a SHA1 03d7793cb4756dcddfafdb312c59efc435742ec7 SHA256 b284414d0ecbdec8d28750aeea231dfef7e31fcd231b33a16676c17c48a6d039
+MISC ChangeLog 3963 RMD160 9b0cc18fbb6d7b0ed80f7db59f31d480d575cf5d SHA1 c7e4a9a6b94972241294f0ce37e74e913ef4b135 SHA256 6b5f4d617ec238f1631163750cf9200304c7f80ea9fb8aae98b761553d1c7a90
 MISC metadata.xml 338 RMD160 12b9a97e0344d5b17266142ce89dd25ee8960473 SHA1 c9b2ae71be49f327648b18e6c3f47a173c339f92 SHA256 6bee320d099a3c6aa010224af6da1a3e7507b7f18bc729768e8657604ffe052a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59C6UACgkQfXuS5UK5QB0yRQP/QstSvEtVymNiTTHOiJqA0p2V
-NKIcC+nwfAuw0Up4Um+A3K08oI7N4Oc7yu7Q0eXwjt9J+p9F0+wvQjVFzDu59iUf
-7X2fuVavJjUjTGqc9Zcaa8mFFc6p2HNlvlJ0DwlaQ1xtI47tbr58gnVezoUeF42L
-pTWk6ZaKJM8picGHPds=
-=0Ygb
+iF4EAREIAAYFAk7Fd78ACgkQaC/OocHi7JbhUAEAk17vnM/TqQW1Db1Sl7BvPr8Z
+Esiw8/MMGmUvfG4rCowA/1ycol4ZgQU6W4M0GsLLTTmC8KzqYB9HXvoeIrfI1vdZ
+=MZKh
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libmix/files/libmix-2.05-gentoo-r1.patch b/dev-libs/libmix/files/libmix-2.05-gentoo-r1.patch
new file mode 100644
index 000000000000..b7405cead6ba
--- /dev/null
+++ b/dev-libs/libmix/files/libmix-2.05-gentoo-r1.patch
@@ -0,0 +1,287 @@
+Fix install paths, respect user flags, build shared libs with -fPIC,
+make static libs optional, convert use "--with/without-net2" instead
+"--without-no-net2"
+
+http://bugs.gentoo.org/268444
+
+Thanks to Doktor Notor <notordoktor@gmail.com>
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,16 +1,18 @@
+-INSTALL_INCLUDES_IN = /usr/include
+-INSTALL_LIBRARY_IN = /usr/lib
+-INSTALL_MANPAGE_IN = /usr/local/man
+-
+-# Compiler to produce C/C++ libraries with (autodetected)
+-GCC = @CCAUTO@
+-GPP = @CXAUTO@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++libdir = @libdir@
++includedir = @includedir@
++mandir = @mandir@
++BUILD_STATIC = @BUILD_STATIC@
+ 
+ RANLIB = @RANLIB@
+ AR = @AR@
+ INSTALL = @INSTALL@
+ 
+ CFLAGS = @CFLAGS@
++CXXFLAGS = @CXXFLAGS@
++LDFLAGS = @LDFLAGS@
++CCOPTS = @CCOPTS@
+ CLIB = @CLIB@
+ 
+ AESOBJ = aes/aes.o aes/cast-256.o aes/mars.o aes/saferp.o aes/twofish.o aes/rijndael.o aes/md5.o
+@@ -21,120 +19,80 @@
+ NETOBJPP = net/net++.o net/net2++.o
+ MISCOBJPP = misc/misc++.o misc/exclude++.o
+ 
+-all: libmix.a libmix.so libmix++.a libmix++.so
++OBJS_C  = $(AESOBJ) $(NETOBJ) $(MISCOBJ)
++OBJS_PP = $(AESOBJPP) $(NETOBJPP) $(MISCOBJPP)
++
++OBJS_C_A  = $(OBJS_C:%.o=%.lo)
++OBJS_PP_A = $(OBJS_PP:%.o=%.lo)
++
++TARGETS = libmix.so libmix++.so
++ifdef BUILD_STATIC
++TARGETS += libmix.a libmix++.a
++endif
++
++all: $(TARGETS)
+ 	@echo ""
+ 	@echo Check the install location in the Makefile, and type 'make install'.
+ 	@echo You may also want to run './libtest' to see all functions work reliably.
+ 	@echo "Attention: libmix for C++ is now called libmix++[.so|.a]. The original libmix.[so|.a] name will be a plain C library."
+ 	@echo ""
+ 
+-libmix.so: mix/net.h ${AESOBJ} ${NETOBJ} ${MISCOBJ}
+-	${GCC} ${CFLAGS} -shared ${AESOBJ} ${NETOBJ} ${MISCOBJ} -o libmix.so ${CLIB}
++libmix.so: $(OBJS_C)
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared $^ -o $@ -Wl,-soname,$@ $(CLIB)
+ 
+-libmix.a: mix/net.h ${AESOBJ} ${NETOBJ} ${MISCOBJ}
+-	${AR} -cr libmix.a ${AESOBJ} ${NETOBJ} ${MISCOBJ}
+-	${RANLIB} libmix.a
++libmix.a: $(OBJS_C_A)
++	$(AR) -cr $@ $^
++	$(RANLIB) $@
+ 
+-libmix++.so: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
+-	${GPP} ${CFLAGS} -shared ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} -o libmix++.so ${CLIB}
++libmix++.so: $(OBJS_PP)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ -o $@ -Wl,-soname,$@ $(CLIB)
+ 
+-libmix++.a: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
+-	${AR} -cr libmix++.a ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
+-	${RANLIB} libmix++.a
++libmix++.a: $(OBJS_PP_A)
++	$(AR) -cr $@ $^
++	$(RANLIB) $@
+ 
+ libtest: libtest.o
+-	${GPP} ${CFLAGS} -static -I. -L. libtest++.o -o libtest -lmix++ @LIBS@ ${CLIB}
++	$(CXX) $(CXXFLAGS) $(CCOPTS) -static -I. -L. $^ -o $@ -lmix++ $(CLIB)
+ 
+ libtest.o:
+-	${GPP} ${CFLAGS} -c libtest.c -o libtest.o
+-	${GPP} ${CFLAGS} -c libtest.c -o libtest++.o
+-
+-aes/aes++.o:
+-	${GPP} ${CFLAGS} -c aes/aes.c -o aes/aes++.o
+-
+-aes/cast-256++.o:
+-	${GPP} ${CFLAGS} -c aes/cast-256.c -o aes/cast-256++.o
+-
+-aes/mars++.o:
+-	${GPP} ${CFLAGS} -c aes/mars.c -o aes/mars++.o
+-
+-aes/saferp++.o:
+-	${GPP} ${CFLAGS} -c aes/saferp.c -o aes/saferp++.o
+-
+-aes/twofish++.o:
+-	${GPP} ${CFLAGS} -c aes/twofish.c -o aes/twofish++.o
+-
+-aes/rijndael++.o:
+-	${GPP} ${CFLAGS} -c aes/rijndael.c -o aes/rijndael++.o
+-
+-aes/md5++.o:
+-	${GPP} ${CFLAGS} -c aes/md5.c -o aes/md5++.o
+-
+-net/net++.o:
+-	${GPP} ${CFLAGS} -c net/net.c -o net/net++.o
+-
+-net/net2++.o:
+-	${GPP} ${CFLAGS} -c net/net2.c -o net/net2++.o
+-
+-misc/misc++.o:
+-	${GPP} ${CFLAGS} -c misc/misc.c -o misc/misc++.o
+-
+-misc/exclude++.o:
+-	${GPP} ${CFLAGS} -c misc/exclude.c -o misc/exclude++.o
+-
+-aes/aes.o:
+-	${GCC} ${CFLAGS} -c aes/aes.c -o aes/aes.o
+-
+-aes/cast-256.o:
+-	${GCC} ${CFLAGS} -c aes/cast-256.c -o aes/cast-256.o
+-
+-aes/mars.o:
+-	${GCC} ${CFLAGS} -c aes/mars.c -o aes/mars.o
+-
+-aes/saferp.o:
+-	${GCC} ${CFLAGS} -c aes/saferp.c -o aes/saferp.o
+-
+-aes/twofish.o:
+-	${GCC} ${CFLAGS} -c aes/twofish.c -o aes/twofish.o
+-
+-aes/rijndael.o:
+-	${GCC} ${CFLAGS} -c aes/rijndael.c -o aes/rijndael.o
+-
+-aes/md5.o:
+-	${GCC} ${CFLAGS} -c aes/md5.c -o aes/md5.o
+-
+-net/net.o:
+-	${GCC} ${CFLAGS} -c net/net.c -o net/net.o
+-
+-net/net2.o:
+-	${GCC} ${CFLAGS} -c net/net2.c -o net/net2.o
++	$(CC) $(CCOPTS) $(CFLAGS) -c libtest.c -o libtest.o
++	$(CXX) $(CCOPTS) $(CXXFLAGS) -c libtest.c -o libtest++.o
+ 
+-misc/misc.o:
+-	${GCC} ${CFLAGS} -c misc/misc.c -o misc/misc.o
+ 
+-misc/exclude.o:
+-	${GCC} ${CFLAGS} -c misc/exclude.c -o misc/exclude.o
++%++.o: %.c
++	$(CXX) $(CCOPTS) $(CXXFLAGS) -fPIC -c $< -o $@
+ 
+-install: mix/mix.h mix/net.h mix/aes.h mix/misc.h libmix.so libmix.a
+-	${INSTALL} -d ${INSTALL_INCLUDES_IN}/mix/
+-	${INSTALL} -d ${INSTALL_LIBRARY_IN}/
+-	${INSTALL} -d ${INSTALL_MANPAGE_IN}/man3/
+-	${INSTALL} -m 0644 libmix.3 ${INSTALL_MANPAGE_IN}/man3/libmix.3
+-	${INSTALL} -m 0644 mix/misc.h ${INSTALL_INCLUDES_IN}/mix/misc.h
+-	${INSTALL} -m 0644 mix/net.h ${INSTALL_INCLUDES_IN}/mix/net.h
+-	${INSTALL} -m 0644 mix/aes.h ${INSTALL_INCLUDES_IN}/mix/aes.h
+-	${INSTALL} -m 0644 mix/mix.h ${INSTALL_INCLUDES_IN}/mix/mix.h
+-	${INSTALL} -m 0644 mix/lmconfig.h ${INSTALL_INCLUDES_IN}/mix/lmconfig.h
+-	${INSTALL} -m 0755 libmix.so ${INSTALL_LIBRARY_IN}/libmix.so
+-	${INSTALL} -m 0755 libmix.a ${INSTALL_LIBRARY_IN}/libmix.a
+-	${INSTALL} -m 0755 libmix++.so ${INSTALL_LIBRARY_IN}/libmix++.so
+-	${INSTALL} -m 0755 libmix++.a ${INSTALL_LIBRARY_IN}/libmix++.a
++%++.lo: %.c
++	$(CXX) $(CCOPTS) $(CXXFLAGS) -c $< -o $@
++
++%.o: %.c
++	$(CC) $(CCOPTS) $(CFLAGS) -fPIC -c $< -o $@
++
++%.lo: %.c
++	$(CC) $(CCOPTS) $(CFLAGS) -c $< -o $@
++
++install: mix/mix.h mix/net.h mix/aes.h mix/misc.h $(TARGETS)
++	${INSTALL} -d $(DESTDIR)/$(includedir)/mix/
++	${INSTALL} -d $(DESTDIR)/$(libdir)/
++	${INSTALL} -d $(DESTDIR)/$(mandir)/man3/
++	${INSTALL} -m 0644 libmix.3 $(DESTDIR)/$(mandir)/man3/libmix.3
++	${INSTALL} -m 0644 mix/misc.h $(DESTDIR)/$(includedir)/mix/misc.h
++	${INSTALL} -m 0644 mix/net.h $(DESTDIR)/$(includedir)/mix/net.h
++	${INSTALL} -m 0644 mix/aes.h $(DESTDIR)/$(includedir)/mix/aes.h
++	${INSTALL} -m 0644 mix/mix.h $(DESTDIR)/$(includedir)/mix/mix.h
++	${INSTALL} -m 0644 mix/lmconfig.h $(DESTDIR)/$(includedir)/mix/lmconfig.h
++	${INSTALL} -m 0755 libmix.so $(DESTDIR)/$(libdir)/libmix.so
++	${INSTALL} -m 0755 libmix++.so $(DESTDIR)/$(libdir)/libmix++.so
++ifdef BUILD_STATIC
++	${INSTALL} -m 0755 libmix.a $(DESTDIR)/$(libdir)/libmix.a
++	${INSTALL} -m 0755 libmix++.a $(DESTDIR)/$(libdir)/libmix++.a
++endif
+ 	@echo ""
+ 	@echo "Installation complete."
+ 	@echo ""
+ 
+ uninstall:
+-	rm -fr /usr/include/mix /usr/lib/libmix* /usr/local/man/man3/libmix.3
++	rm -fr $(includedir)/mix $(libdir)/libmix* $(mandir)/man3/libmix.3
+ 
+ cleanobj:
+ 	rm -f ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} ${AESOBJ} ${NETOBJ} ${MISCOBJ} */core */*~ core *~ *.o libtest
+--- a/configure.in
++++ b/configure.in
+@@ -4,7 +4,6 @@
+ AC_CONFIG_HEADER(mix/lmconfig.h)
+ 
+ compileas="0"
+-net2="1"
+ 
+ dnl AC_ARG_WITH(libraries-as-c, 
+ dnl 	[  --with-libraries-as-c         Generate LibMix binaries with GCC ],
+@@ -24,30 +23,33 @@
+ dnl         ]
+ dnl )
+ 
+-AC_ARG_WITH(no-net2,
+-	[  --with-no-net2		Don't use net2 functions, don't require libnet/libpcap.],
+-	[
+-		if test "x$withval" != "$xno" ; then
+-			net2="0"
+-		fi
+-	]
+-)
++AC_ARG_WITH([net2],
++	AS_HELP_STRING([--with-net2], [Use net2 functions from libnet/libpcap.]))
++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]))
++AS_IF([test "x$enable_static" = "xyes"], [
++	BUILD_STATIC=1
++	AC_SUBST(BUILD_STATIC)
++])
+ 
+ AC_PROG_CC
+ AC_MSG_CHECKING(accepted compiler flags)
+ if test $ac_cv_prog_gcc = yes; then
+-    CCOPTS='-I. -Wall -O3 -funroll-loops -ansi -D_LIBMIX_'
++    CCOPTS='-I. -Wall -ansi -D_LIBMIX_'
+     AC_MSG_RESULT(GNU CC/ANSI (good))
+ else
+     CCOPTS='-I. -D_LIBMIX_'
+     AC_MSG_RESULT(crappy :P)
+ fi
+-    CFLAGS="$CCOPTS"
+ 
+ AC_PROG_CXX
+ 
+ CXAUTO="null"
+-CLIB=""
+ 
+ CCAUTO=$CC
+ CXAUTO=$CXX
+@@ -60,10 +62,6 @@
+ dnl  CXAUTO=$CXX
+ dnl fi
+ 
+-if test $net2 = "1"; then
+-  AC_DEFINE(LM_USE_NET2)
+-  CLIB="-lnet -lpcap"
+-fi
+ 
+ if test $CXAUTO = "null"; then
+   AC_MSG_ERROR( *** Please use either ./configure --with-libraries-as-c
+@@ -74,6 +72,11 @@
+ AC_SUBST(CXAUTO)
+ AC_SUBST(AR)
+ AC_SUBST(CLIB)
++AC_SUBST(LDFLAGS)
++AC_SUBST(libdir)
++AC_SUBST(mandir)
++AC_SUBST(includedir)
++AC_SUBST(CCOPTS)
+ AC_CHECK_PROGS(AR, ar, @true)
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
diff --git a/dev-libs/libmix/libmix-2.05-r6.ebuild b/dev-libs/libmix/libmix-2.05-r6.ebuild
new file mode 100644
index 000000000000..11d20828b6d9
--- /dev/null
+++ b/dev-libs/libmix/libmix-2.05-r6.ebuild
@@ -0,0 +1,44 @@
+# 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-r6.ebuild,v 1.1 2011/11/17 21:08:07 vapier Exp $
+
+EAPI="2"
+
+inherit autotools base multilib toolchain-funcs
+
+DESCRIPTION="Programs Crypto/Network/Multipurpose Library"
+HOMEPAGE="http://mixter.void.ru/"
+SRC_URI="http://mixter.void.ru/${P/.}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="static-libs"
+#IUSE="net2 static-libs"
+
+#DEPEND="net2? ( net-libs/libpcap net-libs/libnet:1.0 )"
+#RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-v${PV}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-pattern.patch
+	"${FILESDIR}"/${P}-gentoo-r1.patch
+	"${FILESDIR}"/${P}-libnet.patch
+)
+
+DOCS=( CHANGES )
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+# net-libs/libnet doesn't provide shared libs, cannot be used currently
+src_configure() {
+	tc-export CC CXX
+	econf \
+		$(use_enable static-libs static) \
+		--without-net2
+#		$(use_with net2)
+}