Use wxwidgets.eclass. Touch up ebuild.

Package-Manager: portage-2.1.2.7

3 files changed, 21 insertions, 26 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index 53b884097a07..9dbb7551efdd 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/gpac
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.39 2007/04/11 20:53:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.40 2007/05/14 04:38:18 dirtyepic Exp $
+
+  14 May 2007; Ryan Hill <dirtyepic@gentoo.org> gpac-0.4.2-r1.ebuild:
+  Use wxwidgets.eclass.  Touch up ebuild.
 
   11 Apr 2007; Alexis Ballier <aballier@gentoo.org>
   +files/gpac-0.4.2-ffmpeg-errno.patch, gpac-0.4.2-r1.ebuild:
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index b394296dc72a..add30f0edef1 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gpac-0.4.2-DESTDIR.patch 4467 RMD160 f84464703edc26fb70136e8cdf4343aae586f6b8 SHA1 32c8a9c31f5f58bb4bdcd94982fb357ea8fbf5f4 SHA256 036d2f787583ee7ed5998c0cf78cb2117365e1a00cabb743f08e0e8863ce7d40
 MD5 0527bbd9606bb7c2fefa5a973838283c files/gpac-0.4.2-DESTDIR.patch 4467
 RMD160 f84464703edc26fb70136e8cdf4343aae586f6b8 files/gpac-0.4.2-DESTDIR.patch 4467
@@ -37,18 +34,18 @@ DIST 26104-610.zip 292640 RMD160 84b2642709ca072c30658a71a6d8bec50fceb2fe SHA1 7
 DIST 26204-600.zip 255764 RMD160 d85a1879e60deeaa9b371646a1d43dd07ae07777 SHA1 fe0746e0456abe9285a54f0c3fd8e20598ee0408 SHA256 01513a7ae5d26ff16a37fba5deec2994a1992829180b4a15d9c646c51eb8fcdb
 DIST gpac-0.4.2-patches.tar.bz2 3899 RMD160 42f9de741f27ca2a942728640582978a497e8721 SHA1 d29abbb5d1aa563e95e45647b5b265bdbbe21a9b SHA256 d0316a55dfc6077437645b8b11a6b0f77ff9d896efd31c8b6fae4d827e7e0e84
 DIST gpac-0.4.2.tar.gz 3916608 RMD160 17d2691651b633497ae96ec71912cfafa864c90a SHA1 800db66f33849886888b24414fb580eaa034a134 SHA256 0e300b02824f12767e5fa0c70b138b6a17375c3d6000aea2568464a9bb1cd956
-EBUILD gpac-0.4.2-r1.ebuild 3999 RMD160 0fedd7284232712f44fd85d7f5e6756ed2eba12c SHA1 985f96035008524d177595b90594c43e43188654 SHA256 59fd8ead10f07e13847caec0367736b1f04740266a66e9392e9a51cb327054e8
-MD5 653e34e4aa947f93e3f0855b5174584d gpac-0.4.2-r1.ebuild 3999
-RMD160 0fedd7284232712f44fd85d7f5e6756ed2eba12c gpac-0.4.2-r1.ebuild 3999
-SHA256 59fd8ead10f07e13847caec0367736b1f04740266a66e9392e9a51cb327054e8 gpac-0.4.2-r1.ebuild 3999
+EBUILD gpac-0.4.2-r1.ebuild 4045 RMD160 dc5cef3de271ef2f1b1e2bafc764d3ffb5b0e6d1 SHA1 a4d0fd37798b8a9d63537be96827282b6e94156f SHA256 a9a729d8b4dde517f4c4410c884c060841fa9d556c724c513e6236ca995efb7d
+MD5 7dce1ccd0ea1de3c9563a3e4d63880ae gpac-0.4.2-r1.ebuild 4045
+RMD160 dc5cef3de271ef2f1b1e2bafc764d3ffb5b0e6d1 gpac-0.4.2-r1.ebuild 4045
+SHA256 a9a729d8b4dde517f4c4410c884c060841fa9d556c724c513e6236ca995efb7d gpac-0.4.2-r1.ebuild 4045
 EBUILD gpac-0.4.2.ebuild 3906 RMD160 1537ad051caabd9b833890dfa29a1c82ade5e40c SHA1 c08146da9baec53cc81f81250904cb75ac7fc9b6 SHA256 bb962564ec34871c9028f55bbdad4ee420f91837eded3341050ad136eed7ed7e
 MD5 7ae88a1cc4647a4e9aa5266afb9b1e05 gpac-0.4.2.ebuild 3906
 RMD160 1537ad051caabd9b833890dfa29a1c82ade5e40c gpac-0.4.2.ebuild 3906
 SHA256 bb962564ec34871c9028f55bbdad4ee420f91837eded3341050ad136eed7ed7e gpac-0.4.2.ebuild 3906
-MISC ChangeLog 6005 RMD160 ecbfffaf12b67117fb36f6a26a14d0c859e8de1e SHA1 be59a33bb1e25719a053b9d848e3002774fa2cce SHA256 368bc9b774a0790779061e70e21064c4b2c962f82252c959ba9386083278e382
-MD5 bbc17f26539eae25de4357ae3237fe48 ChangeLog 6005
-RMD160 ecbfffaf12b67117fb36f6a26a14d0c859e8de1e ChangeLog 6005
-SHA256 368bc9b774a0790779061e70e21064c4b2c962f82252c959ba9386083278e382 ChangeLog 6005
+MISC ChangeLog 6119 RMD160 0e8460b4067709dfad3646c3329c25de3ba399db SHA1 a32b4a45ab7ffba9b79d9a346002b0f1022e4a4c SHA256 b83a20321558e31ed5cb27b669394f3c793aebba06fb64021463a179006ccb43
+MD5 275f8197be19b646bfe5e57911369f8b ChangeLog 6119
+RMD160 0e8460b4067709dfad3646c3329c25de3ba399db ChangeLog 6119
+SHA256 b83a20321558e31ed5cb27b669394f3c793aebba06fb64021463a179006ccb43 ChangeLog 6119
 MISC metadata.xml 347 RMD160 41aa55c1c1abb3244d641ac280b0ff134fd20720 SHA1 08f88c0a9437bad24a2c6655e8e370870145c833 SHA256 702b878c0a6c23d19442ee367c51725d5f7c0a61e0c7b2a57a2708f4622ba8fc
 MD5 cb378e7131783653c967c6365ca31a16 metadata.xml 347
 RMD160 41aa55c1c1abb3244d641ac280b0ff134fd20720 metadata.xml 347
@@ -59,10 +56,3 @@ SHA256 0ada340d415657a975207e0bfca075dc0abc7c38d2ab04d01adcfd843a3d21ce files/di
 MD5 55c51bbc91cbdf60550e92e71ae627f5 files/digest-gpac-0.4.2-r1 928
 RMD160 1c9ad78dc0dba2b8cdbd9a05cfdf515a721d85ad files/digest-gpac-0.4.2-r1 928
 SHA256 397999a1e7316e095eabeb09481b0c7ef90c0917bdba649ad4e3040a093b76ce files/digest-gpac-0.4.2-r1 928
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGHUrOvFcC4BYPU0oRAhE/AKCYknYgWHV3mXnTbJCFYO17t5gBqgCgkd5J
-4QRuzzP3dI7oLOTwsWynEWk=
-=4HyJ
------END PGP SIGNATURE-----
diff --git a/media-video/gpac/gpac-0.4.2-r1.ebuild b/media-video/gpac/gpac-0.4.2-r1.ebuild
index e338fa892218..32ce0c7e7016 100644
--- a/media-video/gpac/gpac-0.4.2-r1.ebuild
+++ b/media-video/gpac/gpac-0.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2-r1.ebuild,v 1.10 2007/04/11 20:53:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2-r1.ebuild,v 1.11 2007/05/14 04:38:18 dirtyepic Exp $
 
 inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs
 
@@ -31,7 +31,7 @@ RDEPEND="aac? ( media-libs/faad2 )
 	vorbis? ( media-libs/libvorbis )
 	theora? ( media-libs/libtheora )
 	truetype? ( >=media-libs/freetype-2.1 )
-	wxwindows? ( >=x11-libs/wxGTK-2.6.0 )
+	wxwindows? ( =x11-libs/wxGTK-2.6* )
 	xml? ( >=dev-libs/libxml2-2.6.0 )
 	xvid? ( >=media-libs/xvid-1.0.1 )
 	sdl? ( media-libs/libsdl )
@@ -75,9 +75,11 @@ src_unpack() {
 	chmod +x configure
 	# make sure configure looks for wx-2.6
 	if use wxwindows; then
-		sed -i -e 's/wx-config/wx-config-2.6/' configure
+		WX_GTK_VER=2.6
+		need-wxwidgets gtk2
+		sed -i -e "s:wx-config:${WX_CONFIG}:g" configure
 	else
-		sed -i 's:^has_wx="yes:has_wx="no:' configure
+		sed -i -e 's:^has_wx="yes:has_wx="no:' configure
 	fi
 
 	use !sdl && sed -i 's:^has_sdl=yes:has_sdl=no:' configure
@@ -92,12 +94,12 @@ src_unpack() {
 	# make sure mozilla won't be used
 	sed -i -e 's/osmozilla//g' applications/Makefile
 
-	# use this to cute down on the warnings noise
+	# use this to cut down on the warnings noise
 	append-flags -fno-strict-aliasing
 
 	# multilib libdir fix
-	sed -i 's:$(prefix)/lib:$(prefix)/'$(get_libdir)':' Makefile src/Makefile
-	sed -i 's:/lib/gpac:/'$(get_libdir)'/gpac:' configure
+	sed -i -e 's:$(prefix)/lib:$(prefix)/'$(get_libdir)':' Makefile src/Makefile
+	sed -i -e 's:/lib/gpac:/'$(get_libdir)'/gpac:' configure
 
 	epatch "${WORKDIR}/${P}-pic.patch"
 	epatch "${FILESDIR}/${P}-bsd.patch"