Bump, drop beta5.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.25.8 i686

3 files changed, 26 insertions, 17 deletions

diff --git a/media-libs/ming/ChangeLog b/media-libs/ming/ChangeLog
index db46a3762ef6..6328e3d801c8 100644
--- a/media-libs/ming/ChangeLog
+++ b/media-libs/ming/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/ming
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.40 2008/06/29 16:51:01 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.41 2008/07/27 21:51:53 loki_val Exp $
+
+*ming-0.4.0_rc1 (27 Jul 2008)
+
+  27 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -ming-0.4.0_beta5.ebuild, +ming-0.4.0_rc1.ebuild:
+  Bump, drop beta5.
 
   29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
   ming-0.4.0_beta5.ebuild:
diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
index ebe4ffd6100b..30b801efb180 100644
--- a/media-libs/ming/Manifest
+++ b/media-libs/ming/Manifest
@@ -4,12 +4,12 @@ AUX ming-0.2a-linking.patch 1115 RMD160 4857939ffbb2fd852f866e5135ac762d9d8a383a
 AUX ming-0.2a-make.patch 2243 RMD160 658072052ecc9c33f693f191419b2ecf90ad6815 SHA1 34059195be138931509a44d0a3166c97b3bc40ed SHA256 ac6c74ca729e4678e5dc7cee245bef0d33568e8cb063fdc65d81399a1fb62d84
 AUX ming-0.3.0--as-needed.patch 7840 RMD160 6104616ba1ab6cecf824d3167e4455bad7d633a8 SHA1 dfb11d85fba618779d2c8e5e50565edb96d50e0c SHA256 336c3ceeb7a5e9de4e5a97ac544af1d65376ca8007fddbed4d77f6f715a9a068
 DIST ming-0.2a.tgz 316447 RMD160 2dc888ca8ffda1e219002081973de8855b3faf61 SHA1 9f8b4d9afcee51351b326e6f072352cc8ac013f5 SHA256 b986908e72228574efcc7d4a196ae4edf9a276399a1ada6aaf66aafe6142e744
-DIST ming-0.4.0.beta5.tar.bz2 9091831 RMD160 11ebba6cf8cecb374a7e36b04543520047dbb14d SHA1 253c1dabc8418919c253aec22ccc0eed33dcc0fa SHA256 c2a6cca736c34e34739ef117c915a09d0df601694420c577d3ecdf98d3be0f88
+DIST ming-0.4.0.rc1.tar.bz2 14434599 RMD160 ab5c64b0edada0f7b50c2643b272140ab2650444 SHA1 bd413e283618be3efff62f5c9226f94b4d4ea50d SHA256 c7a381e96c0ec97ec264a79870deac19e8b41f9166d96af52b5be14a206679a5
 DIST ming_0.3.0-13.diff.gz 44050 RMD160 391c3ebeae85e93523c32d93cd99913cd405335d SHA1 61cf3e77b3589e27dc981cb5f1ce9b7e0a908127 SHA256 b510902798378a05d63eff457cad2a17cfb03aad878136354175fcc3b633f594
 DIST ming_0.3.0.orig.tar.gz 369259 RMD160 d1484c8ed5442f82d3311fe6164beb5dc9ce2ad9 SHA1 e9231132cca3a6e46d8d7988a490871c5c3fa112 SHA256 1eec7136f2b8548476f79335e2dc9cea78f31a0c09a1cccd07782ee4d74959d9
 EBUILD ming-0.2a-r3.ebuild 2793 RMD160 92aff3879884c2abc88d68a48023b2bd0ea93770 SHA1 f11d1ac62f8e3b08dd5dc14120b2511427af7721 SHA256 158c17c81faec3f3949d8dd3f3c8a4015e41c4f2fdac89cac52897e6977e17a9
 EBUILD ming-0.2a.ebuild 1289 RMD160 094a3f91eee05e49aeeae13a54c4287bafbbfb8a SHA1 550c3808962dbdc3aec9ce1c89d769ca2cbb5a9b SHA256 f793a025fdd657f1b0eed2bcb6c67e32f745c574dd58c0895270e3cf6f15dfd4
 EBUILD ming-0.3.0-r1.ebuild 3015 RMD160 679c9b61ce65722dafe8b73373b1cd7135531a1d SHA1 aa1add81930263065cd21bc684e9f01533b09ee3 SHA256 7c0871f2a383862d6e50a12cf82a21455c3f068ccde5b73445653f745f42a818
-EBUILD ming-0.4.0_beta5.ebuild 2402 RMD160 ef53ec46c2ad08f5dc0e08e4999faa1cdca532cb SHA1 8c309d5c3f59f67751ef67c93cc0d69c334c17ca SHA256 9439787567139f9227dcfdd339a36a55dbcb0b964831667c14ca4f50dee772e6
-MISC ChangeLog 5401 RMD160 a936e423c372e1c477f5b785b8211edbc36a024c SHA1 92944f2ae7c00a917b8eb72023723f078a50e071 SHA256 32302af73f068883b5ae73cbcc398d3ca3f11c50e2a87cac301ae3f174d08596
+EBUILD ming-0.4.0_rc1.ebuild 2355 RMD160 2de0cd4fa971506623ceffa5ee5141dae5103d1e SHA1 3211ce64db655b2fe0c9227eb37c2233a17241f1 SHA256 cfc97e9e015a45c096eded0520ff4661238de8a3a2e27c95d94b382307d7d349
+MISC ChangeLog 5558 RMD160 62e71ad91f7f540c1bc1c28ac9a555a9109b2a6b SHA1 228500d4f0ddb57bc3cf034695aeb5a02ef38d45 SHA256 b172e692b084b9d1b3e41c2526b52a149dc3dea471fb9f075d400d8deef1e1fe
 MISC metadata.xml 223 RMD160 ace87a532959975cdc2063eae3f084d846deae1c SHA1 f6aef49f8ff22ce32aa8c5daa92083afceb6daed SHA256 734ba1bf74c0df7a9d79eb4cbfe881d2342efd7a73f85a88e08203b6b302e21e
diff --git a/media-libs/ming/ming-0.4.0_beta5.ebuild b/media-libs/ming/ming-0.4.0_rc1.ebuild
index dfed5fc5f219..d83ffa5aaa20 100644
--- a/media-libs/ming/ming-0.4.0_beta5.ebuild
+++ b/media-libs/ming/ming-0.4.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.0_beta5.ebuild,v 1.4 2008/06/29 16:55:00 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.0_rc1.ebuild,v 1.1 2008/07/27 21:51:53 loki_val Exp $
 
 EAPI=1
 
@@ -23,29 +23,30 @@ RDEPEND="perl? ( dev-lang/perl )
 	sys-libs/zlib
 	!media-libs/libswf"
 DEPEND="${DEPEND}
-	>=dev-lang/swig-1.3.35
 	sys-devel/flex"
 
 S=${WORKDIR}/${P/_/.}
 
+#Tests only work when the package is installed onto a system
+#which does not presently have any version of ming installed.
+
+RESTRICT="test"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	#We need to do this with Swig >=1.3.35, or the tests will
-	#fail for the python extension using gcc-4.3.
-	#probably some aliasing issue with gcc-4.3*
-
-	pushd py_ext &> /dev/null
-	swig -I.. -python ming.i
-	popd &> /dev/null
-
-	#Let's get rid of the TEXTRELS, link dynamic.
+	#Let's get rid of the TEXTRELS, link dynamic. Use gif.
 	sed -i \
 		-e 's/libming.a/libming.so/' \
+		-e 's/lungif/lgif/' \
 		perl_ext/Makefile.PL
+	sed -i \
+		-e 's/ungif/gif/' \
+		py_ext/setup.py.in
+
 	rm macros/libtool.m4
-	AT_M4DIR="macros" eautoreconf
+	eautoreconf
 }
 
 src_compile() {
@@ -89,9 +90,11 @@ pkg_postinst() {
 	fi
 	if use python
 	then
+		python_version
 		ebegin "Compiling ming.py"
-		python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/ming.py || die "ming.py failed"
+		python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/ming.py
 		eend $?
+
 		ebegin "Compiling mingc.py"
 		python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/mingc.py || die "mingc.py failed"
 		eend $?