Clean up the dependencies a bit, add a patch to fix a CXXFLAGS=CFLAGS error.

Package-Manager: portage-2.1.2_rc1-r4

4 files changed, 43 insertions, 15 deletions

diff --git a/media-plugins/libvisual-plugins/ChangeLog b/media-plugins/libvisual-plugins/ChangeLog
index 2aa3f851d720..69e60ac00e84 100644
--- a/media-plugins/libvisual-plugins/ChangeLog
+++ b/media-plugins/libvisual-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/libvisual-plugins
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-plugins/ChangeLog,v 1.22 2006/10/31 07:55:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-plugins/ChangeLog,v 1.23 2006/11/06 23:02:04 flameeyes Exp $
+
+  06 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libvisual-plugins-0.4.0-cxxflags.patch,
+  libvisual-plugins-0.4.0.ebuild:
+  Clean up the dependencies a bit, add a patch to fix a CXXFLAGS=CFLAGS error.
 
   31 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
   libvisual-plugins-0.4.0.ebuild:
diff --git a/media-plugins/libvisual-plugins/Manifest b/media-plugins/libvisual-plugins/Manifest
index 8edb7662b245..df53909a5ab3 100644
--- a/media-plugins/libvisual-plugins/Manifest
+++ b/media-plugins/libvisual-plugins/Manifest
@@ -13,20 +13,24 @@ AUX libvisual-plugins-0.2.0-mkdirhier.patch 1511 RMD160 a5cb60867ce92fca6e59de7a
 MD5 4e8836d46ad26fa82d437ccab5590867 files/libvisual-plugins-0.2.0-mkdirhier.patch 1511
 RMD160 a5cb60867ce92fca6e59de7a198121f146392bb0 files/libvisual-plugins-0.2.0-mkdirhier.patch 1511
 SHA256 828c45f73ddb990bfdbe3a2fb74dca7d123eeb4c445a35794914ff09ef98c5fe files/libvisual-plugins-0.2.0-mkdirhier.patch 1511
+AUX libvisual-plugins-0.4.0-cxxflags.patch 521 RMD160 867c25539eba337d86a5128425f01db5ebce1ebd SHA1 93a5f66af52cc7adc1033e1fa165b853ef1a011b SHA256 fd99f4dc93b04b371237f2e04286223ef25cc8bf4b134d696512fefac5ee6376
+MD5 6008866a4e9c49686af6dae67d5abdea files/libvisual-plugins-0.4.0-cxxflags.patch 521
+RMD160 867c25539eba337d86a5128425f01db5ebce1ebd files/libvisual-plugins-0.4.0-cxxflags.patch 521
+SHA256 fd99f4dc93b04b371237f2e04286223ef25cc8bf4b134d696512fefac5ee6376 files/libvisual-plugins-0.4.0-cxxflags.patch 521
 DIST libvisual-plugins-0.2.0.tar.gz 1021051 RMD160 3f4835843e3719e6342a3b8f1478f89388423b37 SHA1 bc001f66b1c81b747bc06e3e09aaf71882c47370 SHA256 db3b3e0bfe3161dd27a9d189fa235e7ed8958faac0df5173dd3b728aaa06c7fe
 DIST libvisual-plugins-0.4.0.tar.gz 828631 RMD160 f7a82f4a9e4dec3e877833612ece570ffbf2404d SHA1 20490573c282d900ec0bd05133cb3707640254f5 SHA256 8b783a111d54b92502085199c351979d0452b950fcddddd1eae28a16d8508e9b
 EBUILD libvisual-plugins-0.2.0.ebuild 1467 RMD160 b65151194b606554abcd408e341899b5e5b7ad7d SHA1 0543e3c0cfbd88e9e3fc720b65643ad396a4dfeb SHA256 e707d2766297914381e2d01bb6fa6105d56a25463c880571d6c9ac1dd4898ffd
 MD5 fc4728fdbab1e96be123fbec82c2e53e libvisual-plugins-0.2.0.ebuild 1467
 RMD160 b65151194b606554abcd408e341899b5e5b7ad7d libvisual-plugins-0.2.0.ebuild 1467
 SHA256 e707d2766297914381e2d01bb6fa6105d56a25463c880571d6c9ac1dd4898ffd libvisual-plugins-0.2.0.ebuild 1467
-EBUILD libvisual-plugins-0.4.0.ebuild 1119 RMD160 e7fe0c1fb23f9cfd483a43f486892a3bc71daaae SHA1 f82ae7cc5af14450fd3b0398fcda33e02e7c9ffa SHA256 6a3f227f5ad68c8480a4402ba8ef29e955b0324220bab00c22403121fdf6e5a4
-MD5 02c97404318645728ee1bb4ab90eab60 libvisual-plugins-0.4.0.ebuild 1119
-RMD160 e7fe0c1fb23f9cfd483a43f486892a3bc71daaae libvisual-plugins-0.4.0.ebuild 1119
-SHA256 6a3f227f5ad68c8480a4402ba8ef29e955b0324220bab00c22403121fdf6e5a4 libvisual-plugins-0.4.0.ebuild 1119
-MISC ChangeLog 3739 RMD160 171647332e0926767ff67fc4d231e85c1274eadd SHA1 8f151a7b3d5ca459c7e329450679c3b8a5e442d0 SHA256 cedb4632952b10ff5a08c87c6a6e5bd0acdcdc42aa17a21fa283fc8d5f5bbbcf
-MD5 40afb59f623b3a53f8d1f66e7f9501b5 ChangeLog 3739
-RMD160 171647332e0926767ff67fc4d231e85c1274eadd ChangeLog 3739
-SHA256 cedb4632952b10ff5a08c87c6a6e5bd0acdcdc42aa17a21fa283fc8d5f5bbbcf ChangeLog 3739
+EBUILD libvisual-plugins-0.4.0.ebuild 1169 RMD160 404080da385179ce1a100ef8d3b9c63751f31a3b SHA1 61a140caab3353436b34e0072ea72cbb0580a4e5 SHA256 a6fe4d3f67914a0868108f4bd8a1c839361f175fab9e7dd0d01f1aa8451fc2d4
+MD5 532510ccf8cc6d63a166b5bc6d09b7bc libvisual-plugins-0.4.0.ebuild 1169
+RMD160 404080da385179ce1a100ef8d3b9c63751f31a3b libvisual-plugins-0.4.0.ebuild 1169
+SHA256 a6fe4d3f67914a0868108f4bd8a1c839361f175fab9e7dd0d01f1aa8451fc2d4 libvisual-plugins-0.4.0.ebuild 1169
+MISC ChangeLog 3955 RMD160 d4d71d198b440a5c7c24662bbfa639c00f4eb4d3 SHA1 faf914afe8d24c000b8ec61fa2a0725d226b4ccb SHA256 59c309cad3e4fd1a63f99465223a1b781615778b2c603bad4bf5186251d78e19
+MD5 58c4c8dc1260ec757687115f45d9a99d ChangeLog 3955
+RMD160 d4d71d198b440a5c7c24662bbfa639c00f4eb4d3 ChangeLog 3955
+SHA256 59c309cad3e4fd1a63f99465223a1b781615778b2c603bad4bf5186251d78e19 ChangeLog 3955
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -40,7 +44,7 @@ SHA256 385cb9ef49b1f49695406aa702a68514fbed39ce9d8cda537a1b048ae8a6c3a0 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFRwFnAiZjviIA2XgRApyNAKCoa5mkUIlVvSF5G9ecvEhezHxycQCfZEJp
-QDSfAysmziojhfYFY5qSAuQ=
-=WB3E
+iD8DBQFFT77zAiZjviIA2XgRAuBXAKDWhb35FPZ/YKXreWTc+4IgKgtXFwCdE7Fh
+Bm8QWeWPpTYJAvMT+q/8x4M=
+=5ciE
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-cxxflags.patch b/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-cxxflags.patch
new file mode 100644
index 000000000000..33a86e57e8e2
--- /dev/null
+++ b/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-cxxflags.patch
@@ -0,0 +1,13 @@
+Index: libvisual-plugins-0.4.0/configure.ac
+===================================================================
+--- libvisual-plugins-0.4.0.orig/configure.ac
++++ libvisual-plugins-0.4.0/configure.ac
+@@ -515,7 +515,7 @@ fi
+ AC_SUBST(OPT_CFLAGS)
+ 
+ AC_SUBST(CFLAGS, "${CFLAGS} ${DEBUG_CFLAGS} ${OPT_CFLAGS} ${GFORCE_CFLAGS}")
+-AC_SUBST(CXXFLAGS, "${CFLAGS} ${DEBUG_CFLAGS} ${OPT_CFLAGS} ${GFORCE_CFLAGS}")
++AC_SUBST(CXXFLAGS, "${CXXFLAGS} ${DEBUG_CFLAGS} ${OPT_CFLAGS} ${GFORCE_CFLAGS}")
+ 
+ dnl Plugin installation paths
+ 
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0.ebuild
index 983ce7ef39e3..04d19d51fc29 100644
--- a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0.ebuild
+++ b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.ebuild,v 1.9 2006/10/31 07:55:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0.ebuild,v 1.10 2006/11/06 23:02:04 flameeyes Exp $
 
 inherit eutils
 
@@ -14,12 +14,12 @@ KEYWORDS="amd64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="debug esd gtk jack opengl"
 
 RDEPEND="~media-libs/libvisual-${PV}
-	opengl? ( || ( media-libs/mesa virtual/opengl ) )
+	opengl? ( virtual/opengl )
 	esd? ( media-sound/esound )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
 	gtk? ( >=x11-libs/gtk+-2 )
+	media-libs/fontconfig
 	|| ( (
-			media-libs/fontconfig
 			x11-libs/libX11
 			x11-libs/libXext
 			x11-libs/libXrender
@@ -29,6 +29,12 @@ DEPEND="${RDEPEND}
 	|| ( x11-libs/libXt <virtual/x11-7 )
 	>=dev-util/pkgconfig-0.14"
 
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-cxxflags.patch"
+}
+
 src_compile() {
 	econf $(use_enable debug) || die
 	emake || die