Move expf/logf to a safe namespace (bug #455414). Remove net-libs/libnet cruft.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 57 insertions, 327 deletions

diff --git a/dev-libs/libmix/ChangeLog b/dev-libs/libmix/ChangeLog
index cb38f300ce30..2333db25270c 100644
--- a/dev-libs/libmix/ChangeLog
+++ b/dev-libs/libmix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libmix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/ChangeLog,v 1.36 2014/01/18 12:07:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/ChangeLog,v 1.37 2014/07/05 15:58:15 jer Exp $
+
+*libmix-2.05-r7 (05 Jul 2014)
+
+  05 Jul 2014; Jeroen Roovers <jer@gentoo.org> +libmix-2.05-r7.ebuild,
+  -files/libmix-2.05-gentoo.patch, -files/libmix-2.05-gentoo2.patch:
+  Move expf/logf to a safe namespace (bug #455414). Remove net-libs/libnet
+  cruft.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> libmix-2.05-r6.ebuild:
   Add arm64 love.
diff --git a/dev-libs/libmix/Manifest b/dev-libs/libmix/Manifest
index f506f282692f..daee88297b8e 100644
--- a/dev-libs/libmix/Manifest
+++ b/dev-libs/libmix/Manifest
@@ -3,27 +3,16 @@ Hash: SHA256
 
 AUX libmix-2.05-fix-pattern.patch 415 SHA256 7924d3e439ef17d374a1bb6846e8074f416af64a9e35277bfee2e37ab6f4aab9 SHA512 5b74e4a61126e9b5e7abc9ffeff116894ae84ed305bddcf21a2fe0d16e58776599f72e7b85b93845a45f48c877ecc63a3729c2932410c30683d48a96ef410c4b WHIRLPOOL bcd7c9f6327a66932f8671587fb1c0e7e2e9824ee44fea39ae8b686a6fa419a5cbc258be75410a5db5be272e2d5f27724555a711539d6451d7b27ad1f9989f35
 AUX libmix-2.05-gentoo-r1.patch 8328 SHA256 0911b4c639c1da4f3adbb22021dcd3323f1b4bac6a45c2dc7cdedb386ad60876 SHA512 24043efc6a7ebdee97425e63e97bcd298d0e920604277bdcd176c22e20119cacd6ef33a296df815cd98ae327bd149003e3e34c33f939d96bee71be3bac79bf75 WHIRLPOOL 9a3d6fb885b24f59f94125a4f38bfd79e2f3da075e2a4607c2d4b70d663bc99b07abb5d8f2845c83fb136e1830fdf808f1189c8d418592041f8c6bbf509d33b8
-AUX libmix-2.05-gentoo.patch 8398 SHA256 ac0e77f791fb470d0eb0615d6317c5847727747a564a68d7dfb61eb262fa981a SHA512 7e93ac349a7e19a9b0461a563ccf67502903d4909845e33b6cbd8032a3a0109abe865a900cb1cd1fad967144420239e1cdc373c6a635edd81a251ab65c1cf0e2 WHIRLPOOL e8edd26415ef58d46a2787e3bf80fcb369c78f035961964d6fdf7053f2ae4b9c156a05c7dd0e122f2f8195cdf5c56be1bc2e66b730f72b7b1f01f8d6d5971eae
-AUX libmix-2.05-gentoo2.patch 789 SHA256 e8a2d227534a76295fd5a1d440adaabf1d2ca54b82021d143e4f1af7e25ca36c SHA512 5a696dba344e50d14aab98f92a161038711bcd10c752235a5e978620974becb2ff96114b2b9c9986a3e48d44ca832fbbbfef1597c9bd968c77bcf869df32fe69 WHIRLPOOL 33924d8a6cd46d4653f5c056ce751f7076491bc079db163adb38d496dd414b74e851263c9bc16c6b62be00600fbdb60dcd782e12e2f55aef1cd9dd42ccd84796
 AUX libmix-2.05-libnet.patch 509 SHA256 894bfd14719182b540be4e3c127a2a371fae590206e46e001c013fd105c6b4e4 SHA512 3c5204728db7fdecadbd3149a4edb544dafadedffa7d8f1afe2e3290a378865f68ac1189eeab7a6e73176bb4af045f4049dfc75417c143a5aad705906c96b498 WHIRLPOOL b226295673fc830c61f659595d581129684440e393b81c8bf1da87006ed5fdf11571dd859ef1fdbfeb2c3b8c210dbbb8fab7e817e44f819482b3cccfba3f31d0
 DIST libmix-205.tgz 79860 SHA256 7d2ca949652137c20fdf1cb87482f92bdbeef403cd832a8597e747d8651137c6 SHA512 412a1506d15b5ff3fff7f32caf50dca9283c9d667e4bce40a20be45465fcfe72e177159f546d4b8059de94c107faf641d116621ea395bc0ddb91c2a1d77257ec WHIRLPOOL b0f6ff2ebd604abde8ef7a0108903816181b768cccc6a1b8a30b8061d40c01f41f66f30301af49981429b2e8172f65316482c54db02b9d82f2a8a2198525e513
 EBUILD libmix-2.05-r6.ebuild 1078 SHA256 fb8a604182380795e96ed99eef44c5e68101c9accc50bd7c45ca49228864b33a SHA512 c6907ee81a183cbc1c239debb9494c5a5d243c1ed95575c4f5378fbc25afdc4c56a7945efa496fa846a9fb029975a3ced9ed16ca047c306d8f1ec5ce4a41236f WHIRLPOOL 627acfb6c5203061839f83db374a5cfc3d0a328effeea923580cd84bf42910fa2fe0f81fb92917792cd0dc2abfa04231e95de20f63f3aa90f98c7c51da9eaa81
-MISC ChangeLog 5124 SHA256 dcea2f67f84ea5bfd024fd4647638fb136387f799bcb514a6e6a1f72571ae4c3 SHA512 a2de6e4a0af15d855c4cf8243349c94be74832718a219bf9129c4e7f5d25a65a38dfaf28e9000ecad60242965cfb98509858cdf47c72f8a6f76dc17e14e6fcc0 WHIRLPOOL 2c92051bad4ce9fb4a71d84bc3536c8045806b8f43686c67d39146a4fe1a829c35515f2ddb09b497e82980e282bfd76e2f7855dedf9973ad54db11def46e54c3
+EBUILD libmix-2.05-r7.ebuild 982 SHA256 cd3176d70c8af03dc99a45fc33e762d97f9ce3aad12a85def7579912158cc3b4 SHA512 17aa72e654d8a8a4f3590bd1f9f25db7f2452b70f4c1fdd309a7acbb0df6ba183de8b0ace969db8c019d369de08dd79df5236a3dfe153d9aee3d5ae2b06c0687 WHIRLPOOL cda8d9ceab92a8be848a5bea956be3bebab4e983c54c2d70ab066f5797f1d19b6fc203a677810a53470803673272c74de911ea145686126e3435a4f07f6154a5
+MISC ChangeLog 5377 SHA256 2d7dee27d324ecda3b794f979b52c80ead3b56130934bd3c0fb2eb5b6f079e05 SHA512 23fb994e0c0ce39305c4294571142f83130d9cccb6f6af924234ea46506d00a59dd98b40af32c18ed415589c55613a4514cd1996a4a0549ea4cc1e46e63fbb39 WHIRLPOOL 30b3f2b2411d4e4b1f8f76353c02b7b21730345f78ca4f93fe1fd5bccbed6e273842e79ea856e4720f0ecd7180ec3ee329a9f6ec45acdc6d8f585a35f3551c88
 MISC metadata.xml 212 SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757 SHA512 85ac7770baae8cc7c2c52dcd077a448cfb394ec6585e274ffa01c8f92a862d22c6ba0553b71cf2ae6b6f28f6faa5c3d615537f35f9fe0da9f43a2c9043953784 WHIRLPOOL 221b2f4e9b984954eb7268028287339e8678c794c7b4e40ab2baaa037c8e87bac30c8b64473efade9b3ee1ce226aab4ad36760147eee5af7cfd7c081473c839b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS2m5nAAoJEPGu1DbS6WIAZbsP/2+X41KrqvRirkT4+lqP7FtW
-plkfg+oXZeZx18vJxksbdEadVVuD052YEcuVc9BQU8EQCCO0TgfK80+O+I13caJm
-iRhfdQeeA9tdXq2IKDfrnRUj4qN+t59E7QmwBCTUp+IBCIlI3UTn31BgI896eB5V
-kiCD3p/wSxr26/0jJAnhunenOfLHhf2hhdq4tlV05hpqqDYbv91qOU6vveI4yQPq
-FZRswkQ0NLrsETRZswMHfJoEIU8KM+RAKFphUcIOD9+BVTFAEmhrufFYbIHsoZcM
-jD+3Krfkg4OsGFBy/n8IywRsFkUHwDPzFMCNsQT2xKYpyKglukFGS1a0OC0pqCee
-zwBMvEhKnDrSuMxDTgmPSc8cKc1VnNbFXyGW++v7hv1DFWLUew9yTgs8OASKTPs7
-OIoFVBIcgIiEoQHaRg3Uwmw9H+aXuW6MC/SBvdwg5vIhkh/VPisLL5D8f8swkuEO
-8ShnEUhm9gY1ajcRxYrC8wDVUmNsPWyMbASJGLbZXbHXv122Ht3TIQ7WaMeN0ecE
-B0lED9FszDS7WnxNw7BzDIl3ZzsZU5bhoQnBrrhbcBPvzW0Dukr5R/urR2dR6RRW
-pouuVs/MGHvvg72EwrqcLPCCDPX8dWBrmPGx4YOxS8RQpR1TZB1s2zHCf5cet0p3
-Sg9uqsCnMZPKrGYGmOJ9
-=NALz
+iEYEAREIAAYFAlO4IJgACgkQVWmRsqeSphP4SgCfZNS2x7lXaANyHjHCiLLy8dHf
+QFAAn3Fkh9WszK5bvmWMesR4MZcKI7Pl
+=vIo/
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libmix/files/libmix-2.05-gentoo.patch b/dev-libs/libmix/files/libmix-2.05-gentoo.patch
deleted file mode 100644
index a013bd7cc6de..000000000000
--- a/dev-libs/libmix/files/libmix-2.05-gentoo.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-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/show_bug.cgi?id=268444
-
-Thanks to Doktor Notor <notordoktor@gmail.com>
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1,16 +1,16 @@
--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@
-+includedir = /usr/@includedir@
-+libdir = @libdir@
-+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: mix/net.h $(OBJS_C)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared $(OBJS_C) -o libmix.so -Wl,-soname,libmix.so.0 $(CLIB)
- 
--libmix.a: mix/net.h ${AESOBJ} ${NETOBJ} ${MISCOBJ}
--	${AR} -cr libmix.a ${AESOBJ} ${NETOBJ} ${MISCOBJ}
-+libmix.a: mix/net.h $(OBJS_C_A)
-+	${AR} -cr libmix.a $(OBJS_C_A)
- 	${RANLIB} libmix.a
- 
--libmix++.so: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
--	${GPP} ${CFLAGS} -shared ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} -o libmix++.so ${CLIB}
-+libmix++.so: mix/net.h $(OBJS_PP)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJ_PP) -o libmix++.so -Wl,-soname,libmix++.so.0 $(CLIB)
- 
--libmix++.a: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
--	${AR} -cr libmix++.a ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
-+libmix++.a: mix/net.h $(OBJS_PP_A)
-+	${AR} -cr libmix++.a $(OBJS_PP_A)
- 	${RANLIB} libmix++.a
- 
- libtest: libtest.o
--	${GPP} ${CFLAGS} -static -I. -L. libtest++.o -o libtest -lmix++ @LIBS@ ${CLIB}
-+	$(CXX) $(CXXFLAGS) $(CCOPTS) -static -I. -L. libtest++.o -o libtest -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"
-+])
-+
-+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/files/libmix-2.05-gentoo2.patch b/dev-libs/libmix/files/libmix-2.05-gentoo2.patch
deleted file mode 100644
index 41efcc56eca2..000000000000
--- a/dev-libs/libmix/files/libmix-2.05-gentoo2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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-r7.ebuild b/dev-libs/libmix/libmix-2.05-r7.ebuild
new file mode 100644
index 000000000000..a249884eb40d
--- /dev/null
+++ b/dev-libs/libmix/libmix-2.05-r7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/libmix-2.05-r7.ebuild,v 1.1 2014/07/05 15:58:15 jer Exp $
+
+EAPI=5
+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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="static-libs"
+
+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
+
+	sed -i \
+		-e 's/expf/libmix_expf/g' \
+		-e 's/logf/libmix_logf/g' \
+		aes/saferp.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC CXX
+	econf \
+		$(use_enable static-libs static) \
+		--without-net2
+}