Don't install COPYING and INSTALL files. Use autotools eclass to re-create the autotools files. Minor style fixes.

(Portage version: 2.0.51.22)

4 files changed, 21 insertions, 37 deletions

diff --git a/media-plugins/eq-xmms/ChangeLog b/media-plugins/eq-xmms/ChangeLog
index 846ad60dc159..f199ae02fa4b 100644
--- a/media-plugins/eq-xmms/ChangeLog
+++ b/media-plugins/eq-xmms/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/eq-xmms
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/eq-xmms/ChangeLog,v 1.11 2005/07/03 08:55:11 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/eq-xmms/ChangeLog,v 1.12 2005/09/04 10:23:27 flameeyes Exp $
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> eq-xmms-0.6-r1.ebuild,
+  eq-xmms-0.6-r2.ebuild, eq-xmms-0.6-r3.ebuild:
+  Don't install COPYING and INSTALL files. Use autotools eclass to re-create
+  the autotools files. Minor style fixes.
 
 *eq-xmms-0.6-r3 (03 Jul 2005)
 
diff --git a/media-plugins/eq-xmms/eq-xmms-0.6-r1.ebuild b/media-plugins/eq-xmms/eq-xmms-0.6-r1.ebuild
index d4d69b5ce68c..237b5d7427e3 100644
--- a/media-plugins/eq-xmms/eq-xmms-0.6-r1.ebuild
+++ b/media-plugins/eq-xmms/eq-xmms-0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/eq-xmms/eq-xmms-0.6-r1.ebuild,v 1.5 2005/03/15 19:40:25 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/eq-xmms/eq-xmms-0.6-r1.ebuild,v 1.6 2005/09/04 10:23:27 flameeyes Exp $
 
 IUSE=""
 
@@ -37,5 +37,5 @@ src_unpack() {
 src_install() {
 	make DESTDIR="${D}" libdir=`xmms-config --effect-plugin-dir` install || die
 
-	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README README.BSD SKINS TODO
+	dodoc AUTHORS BUGS ChangeLog NEWS README README.BSD SKINS TODO
 }
diff --git a/media-plugins/eq-xmms/eq-xmms-0.6-r2.ebuild b/media-plugins/eq-xmms/eq-xmms-0.6-r2.ebuild
index b36a53e3e83b..b0981749e067 100644
--- a/media-plugins/eq-xmms/eq-xmms-0.6-r2.ebuild
+++ b/media-plugins/eq-xmms/eq-xmms-0.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/eq-xmms/eq-xmms-0.6-r2.ebuild,v 1.1 2005/03/22 13:29:34 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/eq-xmms/eq-xmms-0.6-r2.ebuild,v 1.2 2005/09/04 10:23:27 flameeyes Exp $
 
 IUSE=""
 
@@ -38,5 +38,5 @@ src_unpack() {
 src_install() {
 	make DESTDIR="${D}" libdir=`xmms-config --effect-plugin-dir` install || die
 
-	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README README.BSD SKINS TODO
+	dodoc AUTHORS BUGS ChangeLog NEWS README README.BSD SKINS TODO
 }
diff --git a/media-plugins/eq-xmms/eq-xmms-0.6-r3.ebuild b/media-plugins/eq-xmms/eq-xmms-0.6-r3.ebuild
index 4f64d600838f..a90529a1b583 100644
--- a/media-plugins/eq-xmms/eq-xmms-0.6-r3.ebuild
+++ b/media-plugins/eq-xmms/eq-xmms-0.6-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/eq-xmms/eq-xmms-0.6-r3.ebuild,v 1.1 2005/07/03 08:55:11 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/eq-xmms/eq-xmms-0.6-r3.ebuild,v 1.2 2005/09/04 10:23:27 flameeyes Exp $
 
 IUSE="sse-filters"
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="EQU is a realtime graphical equalizer effect plugin that will equalize almost everything that you play through XMMS, not just the MP3s"
 HOMEPAGE="http://equ.sourceforge.net/"
@@ -27,46 +27,25 @@ src_unpack() {
 	if ! use x86 || use sse-filters; then
 		cd ${S}
 
-		use sse-filters && {
+		if use sse-filters; then
 			epatch ${FILESDIR}/${P}-sse_filters.patch.bz2
 
-			use x86 || {
-				epatch ${FILESDIR}/${P}-sse_round_trickfilters.patch
-			}
-		}
+			use x86 || epatch ${FILESDIR}/${P}-sse_round_trickfilters.patch
+		fi
 
-		use x86 || {
-			epatch ${FILESDIR}/${P}-nonx86.patch
-		}
+		use x86 || epatch ${FILESDIR}/${P}-nonx86.patch
 
-		ebegin "Performing auto-magic"
-		eindent
-			ebegin "aclocal"
-			WANT_AUTOMAKE=1.7 aclocal
-			eend ${?}
+		export WANT_AUTOMAKE="1.6"
+		export WANT_AUTOCONF="2.5"
+		eautoreconf
 
-			ebegin "automake"
-			WANT_AUTOMAKE=1.7 automake
-			eend ${?}
-
-			ebegin "autoconf"
-			WANT_AUTOCONF=2.5 autoconf
-			eend ${?}
-
-			ebegin "libtoolize"
-			libtoolize --copy --force
-			eend ${?}
-		eoutdent
-		eend ${?}
-
-		use sse-filters && {
+		use sse-filters && \
 			sed -e "s:@CFLAGS@:@CFLAGS@ -DSSE_FILTERS:" -i ${S}/src/Makefile.in
-		}
 	fi
 }
 
 src_install() {
 	make DESTDIR="${D}" libdir=`xmms-config --effect-plugin-dir` install || die
 
-	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README README.BSD SKINS TODO
+	dodoc AUTHORS BUGS ChangeLog NEWS README README.BSD SKINS TODO
 }