Drop virtual/libc dependency, update to modular X, allow building with gcc4, use econf instead of ./configure.

Package-Manager: portage-2.1_pre5-r4

5 files changed, 76 insertions, 24 deletions

diff --git a/media-video/sampeg3/ChangeLog b/media-video/sampeg3/ChangeLog
index d43a18f09d44..a2656aca143a 100644
--- a/media-video/sampeg3/ChangeLog
+++ b/media-video/sampeg3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/sampeg3
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/sampeg3/ChangeLog,v 1.8 2005/09/10 15:43:16 flameeyes Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/sampeg3/ChangeLog,v 1.9 2006/03/07 17:15:53 flameeyes Exp $
+
+  07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/sampeg3-0.0.3-gcc4.patch, metadata.xml, sampeg3-0.0.3.ebuild:
+  Drop virtual/libc dependency, update to modular X, allow building with gcc4,
+  use econf instead of ./configure.
 
   10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> sampeg3-0.0.3.ebuild:
   Don't install INSTALL file.
diff --git a/media-video/sampeg3/Manifest b/media-video/sampeg3/Manifest
index 50a7ceef53b7..dd836d7350ff 100644
--- a/media-video/sampeg3/Manifest
+++ b/media-video/sampeg3/Manifest
@@ -1,14 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 be885ffbb476e85a2dedd219df2f911d ChangeLog 1102
-MD5 a32d491a57ef80b73d2373082b31a2e4 sampeg3-0.0.3.ebuild 897
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 622ea202cd7de54ccadb0974f4b2e4c5 ChangeLog 1342
+RMD160 f40a890b6215ccbdaacb691606705027238a6d07 ChangeLog 1342
+SHA256 ee1453655bfd07bac5459da43c1a784e2971f64e1eb1a369b6665d6dc1e3e1c8 ChangeLog 1342
 MD5 17672dee1b88259a5f93ee1a17086396 files/digest-sampeg3-0.0.3 65
+RMD160 f1756a81e57b12a7d0496182186fd421d044ccda files/digest-sampeg3-0.0.3 65
+SHA256 da25a8ac483383bc0b4bf576b13f5a07b75c532b81928a808f921788e5348ced files/digest-sampeg3-0.0.3 65
+MD5 874c7f5a55f8f30e789d551acda0bd68 files/sampeg3-0.0.3-gcc4.patch 854
+RMD160 012833639281c4356379ae299a11ba5e7aea8a29 files/sampeg3-0.0.3-gcc4.patch 854
+SHA256 a995f4d7cb324e92b9a2c3681315cdba404b35454704760bdc810cf9909f42e3 files/sampeg3-0.0.3-gcc4.patch 854
+MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
+RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
+SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 metadata.xml 223
+MD5 007ba67ab77cc871643144b3c487504f sampeg3-0.0.3.ebuild 972
+RMD160 ded8a3dd1491a10d357652a011a2c2ad371ee507 sampeg3-0.0.3.ebuild 972
+SHA256 445856d17bfe44840a8410fea29fd2a0cb4236e3939709a8f6d94e3e0b7ff3aa sampeg3-0.0.3.ebuild 972
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFDIv8uj5H05b2HAEkRAsCKAJoChotE+98EN/od5Z+lbmt3OcBHJgCgo2Yo
-Zw9R3ELXdHRKcgJufpBdsy8=
-=BsUw
+iD4DBQFEDb/WAiZjviIA2XgRAoWfAJ9IpUckuQuXap2SlrvPfmADpSmF5QCVEq/H
+kyRj6WBrxZyE5hXlWnLR2g==
+=Jbtm
 -----END PGP SIGNATURE-----
diff --git a/media-video/sampeg3/files/sampeg3-0.0.3-gcc4.patch b/media-video/sampeg3/files/sampeg3-0.0.3-gcc4.patch
new file mode 100644
index 000000000000..4484c9816ead
--- /dev/null
+++ b/media-video/sampeg3/files/sampeg3-0.0.3-gcc4.patch
@@ -0,0 +1,27 @@
+Index: sampeg3-0.0.3/src/coding/dct/idctblk_fp_aan.hh
+===================================================================
+--- sampeg3-0.0.3.orig/src/coding/dct/idctblk_fp_aan.hh
++++ sampeg3-0.0.3/src/coding/dct/idctblk_fp_aan.hh
+@@ -50,6 +50,9 @@
+ 
+ #include "coding/dct/dctblk.hh"
+ 
++#ifndef PI
++#define PI M_PI
++#endif
+ 
+ template <class OutputType,int Low,int High> class IDCTBlk_AccurateFP
+   : public IDCTBlk<OutputType,Low,High>
+Index: sampeg3-0.0.3/src/test/rdcurves.cc
+===================================================================
+--- sampeg3-0.0.3.orig/src/test/rdcurves.cc
++++ sampeg3-0.0.3/src/test/rdcurves.cc
+@@ -86,7 +86,7 @@ private:
+   static const int left = 3*28;
+   static const int top  = 26*28;
+   static const double width=16*28;
+-  static const double height = width*3/4;
++  static const double height = (16*28)*3/4;
+ };
+ 
+ 
diff --git a/media-video/sampeg3/metadata.xml b/media-video/sampeg3/metadata.xml
index 1cadc2e4ec21..edccfe5754d2 100644
--- a/media-video/sampeg3/metadata.xml
+++ b/media-video/sampeg3/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>video</herd>
 <maintainer>
-  <email>media-video@gentoo.org</email>
+<email>media-video@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/media-video/sampeg3/sampeg3-0.0.3.ebuild b/media-video/sampeg3/sampeg3-0.0.3.ebuild
index 8e61ac5f63e1..aeec81f789ff 100644
--- a/media-video/sampeg3/sampeg3-0.0.3.ebuild
+++ b/media-video/sampeg3/sampeg3-0.0.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/sampeg3/sampeg3-0.0.3.ebuild,v 1.6 2005/09/10 15:43:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/sampeg3/sampeg3-0.0.3.ebuild,v 1.7 2006/03/07 17:15:53 flameeyes Exp $
+
+inherit flag-o-matic
 
 DESCRIPTION="MPEG video encoder targeted for optimum picture quality"
 HOMEPAGE="http://rachmaninoff.informatik.uni-mannheim.de/sampeg/"
@@ -13,20 +15,27 @@ KEYWORDS="~x86 ~ppc"
 
 IUSE=""
 
-DEPEND="virtual/libc
-		sys-libs/zlib
-		>=media-libs/libvideogfx-1.0
+RDEPEND=">=media-libs/libvideogfx-1.0
 		media-libs/libpng
 		media-libs/jpeg
-		virtual/x11"
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake || die
+		|| ( (
+				x11-libs/libX11
+				x11-libs/libXext
+				x11-libs/libXv
+			) virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )"
+
+pkg_setup() {
+	append-flags -fpermissive
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-gcc4.patch"
 }
 
 src_install() {