Respect LDFLAGS + QA + autotools fixes from Doktor Notor <notordoktor@gmail.com>. Bug #268444. Remove old ebuilds

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 123 insertions, 53 deletions

diff --git a/dev-libs/libmix/ChangeLog b/dev-libs/libmix/ChangeLog
index 05abf9d06d69..17b8f64fb05c 100644
--- a/dev-libs/libmix/ChangeLog
+++ b/dev-libs/libmix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libmix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/ChangeLog,v 1.10 2010/07/14 03:46:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/ChangeLog,v 1.11 2010/08/06 14:25:47 hwoarang Exp $
+
+*libmix-2.05-r3 (06 Aug 2010)
+
+  06 Aug 2010; Markos Chandras <hwoarang@gentoo.org> -libmix-2.05-r1.ebuild,
+  -libmix-2.05-r2.ebuild, +libmix-2.05-r3.ebuild,
+  +files/libmix-2.05-autotools.patch:
+  Respect LDFLAGS + QA + autotools fixes from Doktor Notor
+  <notordoktor@gmail.com>. Bug #268444. Remove old ebuilds
 
 *libmix-2.05-r2 (14 Jul 2010)
 
diff --git a/dev-libs/libmix/files/libmix-2.05-autotools.patch b/dev-libs/libmix/files/libmix-2.05-autotools.patch
new file mode 100644
index 000000000000..e66caedec0b0
--- /dev/null
+++ b/dev-libs/libmix/files/libmix-2.05-autotools.patch
@@ -0,0 +1,108 @@
+--- Makefile.in.orig	2003-01-02 17:52:41.000000000 +0100
++++ Makefile.in	2010-03-20 22:10:42.000000000 +0100
+@@ -1,6 +1,6 @@
+-INSTALL_INCLUDES_IN = /usr/include
+-INSTALL_LIBRARY_IN = /usr/lib
+-INSTALL_MANPAGE_IN = /usr/local/man
++includedir = /usr/@includedir@
++libdir = /usr/@libdir@
++mandir = @mandir@
+ 
+ # Compiler to produce C/C++ libraries with (autodetected)
+ GCC = @CCAUTO@
+@@ -11,6 +11,7 @@
+ INSTALL = @INSTALL@
+ 
+ CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ 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
+@@ -29,14 +30,14 @@
+ 	@echo ""
+ 
+ libmix.so: mix/net.h ${AESOBJ} ${NETOBJ} ${MISCOBJ}
+-	${GCC} ${CFLAGS} -shared ${AESOBJ} ${NETOBJ} ${MISCOBJ} -o libmix.so ${CLIB}
++	${GCC} ${CFLAGS} -shared ${AESOBJ} ${NETOBJ} ${MISCOBJ} -o libmix.so ${LDFLAGS} -Wl,-soname,libmix.so.0 ${CLIB}
+ 
+ libmix.a: mix/net.h ${AESOBJ} ${NETOBJ} ${MISCOBJ}
+ 	${AR} -cr libmix.a ${AESOBJ} ${NETOBJ} ${MISCOBJ}
+ 	${RANLIB} libmix.a
+ 
+ libmix++.so: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
+-	${GPP} ${CFLAGS} -shared ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} -o libmix++.so ${CLIB}
++	${GPP} ${CFLAGS} -shared ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} -o libmix++.so -Wl,-soname,libmix++.so.0 ${LDFLAGS} ${CLIB}
+ 
+ libmix++.a: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
+ 	${AR} -cr libmix++.a ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
+@@ -116,25 +117,25 @@
+ 	${GCC} ${CFLAGS} -c misc/exclude.c -o misc/exclude.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
++	${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.a $(DESTDIR)/$(libdir)/libmix.a
++	${INSTALL} -m 0755 libmix++.so $(DESTDIR)/$(libdir)/libmix++.so
++	${INSTALL} -m 0755 libmix++.a $(DESTDIR)/$(libdir)/libmix++.a
+ 	@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
+--- configure.in.orig	2002-05-19 10:59:20.000000000 +0200
++++ configure.in	2010-03-20 22:18:22.000000000 +0100
+@@ -4,7 +4,7 @@
+ AC_CONFIG_HEADER(mix/lmconfig.h)
+ 
+ compileas="0"
+-net2="1"
++net2="0"
+ 
+ dnl AC_ARG_WITH(libraries-as-c, 
+ dnl 	[  --with-libraries-as-c         Generate LibMix binaries with GCC ],
+@@ -36,7 +36,7 @@
+ 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 -fPIC -ansi -D_LIBMIX_'
+     AC_MSG_RESULT(GNU CC/ANSI (good))
+ else
+     CCOPTS='-I. -D_LIBMIX_'
+@@ -74,6 +74,10 @@
+ AC_SUBST(CXAUTO)
+ AC_SUBST(AR)
+ AC_SUBST(CLIB)
++AC_SUBST(LDFLAGS)
++AC_SUBST(libdir)
++AC_SUBST(mandir)
++AC_SUBST(includedir)
+ AC_CHECK_PROGS(AR, ar, @true)
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
diff --git a/dev-libs/libmix/libmix-2.05-r1.ebuild b/dev-libs/libmix/libmix-2.05-r1.ebuild
deleted file mode 100644
index 9cbbc126e202..000000000000
--- a/dev-libs/libmix/libmix-2.05-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/libmix-2.05-r1.ebuild,v 1.1 2009/01/08 19:11:40 jer Exp $
-
-inherit multilib eutils
-
-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="no-net2"
-
-DEPEND="!no-net2? ( virtual/libpcap net-libs/libnet )"
-
-S=${WORKDIR}/${PN}-v${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i "s:-O3 -funroll-loops:${CFLAGS} -fPIC:" configure
-	epatch "${FILESDIR}"/${P}-fix-pattern.patch
-}
-
-src_compile() {
-	econf $(use_with no-net2) || die
-	emake || die
-}
-
-src_install() {
-	make \
-		INSTALL_INCLUDES_IN="${D}"/usr/include \
-		INSTALL_LIBRARY_IN="${D}"/usr/$(get_libdir) \
-		INSTALL_MANPAGE_IN="${D}"/usr/share/man \
-		install || die
-	dodoc CHANGES
-}
diff --git a/dev-libs/libmix/libmix-2.05-r2.ebuild b/dev-libs/libmix/libmix-2.05-r3.ebuild
index ff039ac10597..81a6b45f7a23 100644
--- a/dev-libs/libmix/libmix-2.05-r2.ebuild
+++ b/dev-libs/libmix/libmix-2.05-r3.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/libmix-2.05-r2.ebuild,v 1.1 2010/07/14 03:46:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/libmix-2.05-r3.ebuild,v 1.1 2010/08/06 14:25:47 hwoarang Exp $
 
 EAPI="2"
-
-inherit eutils multilib toolchain-funcs
+inherit autotools eutils
 
 DESCRIPTION="Programs Crypto/Network/Multipurpose Library"
 HOMEPAGE="http://mixter.void.ru/"
@@ -20,22 +19,16 @@ DEPEND="!no-net2? ( virtual/libpcap net-libs/libnet )"
 S=${WORKDIR}/${PN}-v${PV}
 
 src_prepare() {
-	sed -i configure \
-		-e "s:-O3 -funroll-loops:${CFLAGS} ${LDFLAGS} -fPIC:" \
-		|| die "sed CFLAGS LDFLAGS failed"
 	epatch "${FILESDIR}"/${P}-fix-pattern.patch
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	eautoreconf
 }
 
 src_configure() {
-	tc-export CC CXX
-	econf $(use_with no-net2) || die
+	econf $(use_with no-net2) || die "econf failed"
 }
 
 src_install() {
-	make \
-		INSTALL_INCLUDES_IN="${D}"/usr/include \
-		INSTALL_LIBRARY_IN="${D}"/usr/$(get_libdir) \
-		INSTALL_MANPAGE_IN="${D}"/usr/share/man \
-		install || die
+	emake DESTDIR="${D}" install || die "install failed"
 	dodoc CHANGES
 }