Fix location of MKINSTALLDIRS sed wrt #417631 by Jeroen Roovers and Brett Royles. Remove --enable-static from econf and remove all libtool files since they are unrequired for dlopening these plugins. tidy

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

3 files changed, 47 insertions, 40 deletions

diff --git a/media-plugins/libvisual-plugins/ChangeLog b/media-plugins/libvisual-plugins/ChangeLog
index 6a09cfa3fb9d..07ed64b2d570 100644
--- a/media-plugins/libvisual-plugins/ChangeLog
+++ b/media-plugins/libvisual-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/libvisual-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-plugins/ChangeLog,v 1.54 2012/05/17 15:32:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-plugins/ChangeLog,v 1.55 2012/05/31 19:44:36 ssuominen Exp $
+
+  31 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+  libvisual-plugins-0.4.0-r2.ebuild:
+  Fix location of MKINSTALLDIRS sed wrt #417631 by Jeroen Roovers and Brett
+  Royles. Remove --enable-static from econf and remove all libtool files since
+  they are unrequired for dlopening these plugins.
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org>
   libvisual-plugins-0.4.0-r2.ebuild:
diff --git a/media-plugins/libvisual-plugins/Manifest b/media-plugins/libvisual-plugins/Manifest
index 0458e7793ff1..e7ce295600dd 100644
--- a/media-plugins/libvisual-plugins/Manifest
+++ b/media-plugins/libvisual-plugins/Manifest
@@ -4,13 +4,17 @@ Hash: SHA1
 DIST libvisual-plugins-0.4.0-m4-1.tar.bz2 1872 RMD160 2ef4f1677c445cf7beab7bf95b4164c847c81896 SHA1 d9456ab39790878efd255c838c3379208c8cdb40 SHA256 0746a6088fa292b27a869fd70ea0f19b0dccd73879694148bd65a372dea333af
 DIST libvisual-plugins-0.4.0-patches-4.tar.bz2 10814 RMD160 ce27ad96d656510f7a82014ef5ae7613f36320f2 SHA1 3f2e4a8bdbf0436d8ba709b92ae12c0960bc893e SHA256 8f87b7f0c6d9560804e19778af41a7bcae0a2923d59095823b105c2899636913
 DIST libvisual-plugins-0.4.0.tar.gz 828631 RMD160 f7a82f4a9e4dec3e877833612ece570ffbf2404d SHA1 20490573c282d900ec0bd05133cb3707640254f5 SHA256 8b783a111d54b92502085199c351979d0452b950fcddddd1eae28a16d8508e9b
-EBUILD libvisual-plugins-0.4.0-r2.ebuild 1717 RMD160 b5b9749af9f21cfb11cb8afa191e2f0b78fffc14 SHA1 15b4add4725c514c7f8e15b4109bca2c8722123d SHA256 8823e3232552fb92845122f30b926c62e478fd00ed46667af7a3404191e78d82
-MISC ChangeLog 8562 RMD160 8eda18318b3f564273b5037a3412183ac243910b SHA1 33bb61bc2a654613040fcaf5acfb9f38b9db9ad0 SHA256 b4e6bc916f287d9090e68d4757041213086dac0034e5a1002cfd70b52c6f9e27
+EBUILD libvisual-plugins-0.4.0-r2.ebuild 1708 RMD160 05cd9b2a4290c2d196823b43fb7a7f28e28a98bb SHA1 f49086e6204a1651a884bbf064ef2d443971d378 SHA256 8a45fd6cf55b9f7ef4e3f0d43dab40cecdb4d230f9342d27e2449e9a4a9019fb
+MISC ChangeLog 8861 RMD160 2a1619542c30f53c16ceddab48fad674b2fb2e4a SHA1 c046a061ce92b599fae5aabf9dc396b95aac3396 SHA256 a2b540b76825972ea60ca0e2fc383b9ab2ecb658c2dfb9d68dd78af7bdcd3b48
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+1GgkACgkQvFcC4BYPU0o+OgCgpjneJXiiFpIUr936BUyKU+UZ
-F0QAoJuF9i7gli4rsamqqzBUArpvaU8Q
-=faGs
+iQEcBAEBAgAGBQJPx8lJAAoJEEdUh39IaPFNH1kH/17P6psJhntwpMl0SZeG4fIb
+OPWH/Tg+N9yEOEkLsjP78l83zaI6/4MhbNgdjOJCaFI8pGaPzpRqCBijijSfZeqA
+fArRm9rjlFMHiDlJWG1UqgpdNOgt0I00dsmfKExFd8BlaIRlQTMHO8q3FoPVP+zL
+u+DgGRGEDvBgmj2UlOqKgR5rfQfXNi8tLSBkBGwbFI6PqglVu4pUBqi391AdKoHs
+88E5rfes5LCYyAdv9Q3vT81S13McVZpwPnVvFrIMlYkMCskyHP9TWbyFE+HFXp8g
+YC+q5L3/1cL30LVedHu4rKkcLHgwKmsLMcAWz8FuuRf37YWKsci2fO51wHe7mJc=
+=KEq/
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r2.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r2.ebuild
index 343a05713fd7..3c4a42e7d2c6 100644
--- a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r2.ebuild
+++ b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r2.ebuild
@@ -1,65 +1,62 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r2.ebuild,v 1.15 2012/05/17 15:32:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r2.ebuild,v 1.16 2012/05/31 19:44:36 ssuominen Exp $
 
-EAPI=1
-inherit eutils autotools
+EAPI=4
+inherit autotools eutils
 
-PATCHLEVEL="4"
+PATCHLEVEL=4
 
-DESCRIPTION="Visualization plugins for use with the libvisual framework."
+DESCRIPTION="collection of visualization plugins for use with the libvisual framework"
 HOMEPAGE="http://libvisual.sourceforge.net/"
 SRC_URI="mirror://sourceforge/libvisual/${P}.tar.gz
 	mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2
 	mirror://gentoo/${P}-m4-1.tar.bz2"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0.4"
 KEYWORDS="amd64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="alsa debug gtk jack mplayer opengl"
 
-RDEPEND="~media-libs/libvisual-${PV}
-	opengl? ( virtual/opengl )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
-	gtk? ( x11-libs/gtk+:2 )
+RDEPEND="media-libs/fontconfig
+	~media-libs/libvisual-${PV}
+    x11-libs/libX11
+    x11-libs/libXext
+	x11-libs/libXrender
 	alsa? ( media-libs/alsa-lib )
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender"
+	gtk? ( x11-libs/gtk+:2 )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.109 )
+	opengl? ( virtual/opengl )"
 DEPEND="${RDEPEND}
-	x11-libs/libXt
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	x11-libs/libXt"
 
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:@MKINSTALLDIRS@:${S}/mkinstalldirs:" "${S}"/po/Makefile.*
+DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-	cd "${S}"
+src_prepare() {
+	EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patches
+	AT_M4DIR=${WORKDIR}/m4 eautoreconf
 
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	AT_M4DIR="${WORKDIR}/m4" eautoreconf
+	sed -i -e "s:@MKINSTALLDIRS@:${S}/mkinstalldirs:" po/Makefile.* || die
 }
 
-src_compile() {
+src_configure() {
 	econf \
-		$(use_enable debug) \
-		$(use_enable debug inputdebug) \
+		--disable-esd \
+		$(use_enable jack) \
 		$(use_enable gtk gdkpixbuf-plugin) \
+		--disable-gstreamer-plugin \
 		$(use_enable alsa) \
+		$(use_enable mplayer) \
+		$(use_enable debug inputdebug) \
 		$(use_enable opengl gltest) \
+		$(use_enable opengl nastyfft) \
 		$(use_enable opengl madspin) \
 		$(use_enable opengl flower) \
-		$(use_enable opengl nastyfft) \
-		$(use_enable mplayer) \
-		--disable-esd \
-		$(use_enable jack) \
-		--enable-static --disable-gstreamer-plugin
-
-	emake || die
+		$(use_enable debug)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	default
+	find "${ED}"/usr -type f -name '*.la' -exec rm -f {} +
 }