Drop old versions, fix dependencies and use epatch in last version.

Package-Manager: portage-2.1_pre4-r1

7 files changed, 32 insertions, 123 deletions

diff --git a/media-video/xmps/ChangeLog b/media-video/xmps/ChangeLog
index aede698a81b1..362dbc64a5d8 100644
--- a/media-video/xmps/ChangeLog
+++ b/media-video/xmps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/xmps
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xmps/ChangeLog,v 1.10 2005/09/03 23:25:04 flameeyes Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xmps/ChangeLog,v 1.11 2006/02/15 16:17:07 flameeyes Exp $
+
+  15 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> -xmps-0.2.0-r1.ebuild,
+  -xmps-0.2.0-r2.ebuild, xmps-0.2.0-r3.ebuild:
+  Drop old versions, fix dependencies and use epatch in last version.
 
   03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> xmps-0.2.0-r1.ebuild,
   xmps-0.2.0-r2.ebuild, xmps-0.2.0-r3.ebuild:
diff --git a/media-video/xmps/Manifest b/media-video/xmps/Manifest
index 4b452f0103f1..f4c31120c611 100644
--- a/media-video/xmps/Manifest
+++ b/media-video/xmps/Manifest
@@ -1,19 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 2b55f1f69b089cd8b0aceecdbe6e10f2 ChangeLog 1682
-MD5 65d501eb04f67348063c27b48e7a9fea xmps-0.2.0-r1.ebuild 980
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 cd90f8ffab3db9f07b5863741640036d xmps-0.2.0-r2.ebuild 1267
-MD5 45830156a0274fdf35c5e925c74eab4c xmps-0.2.0-r3.ebuild 1431
+MD5 e5ed8751ceb01249b4fc438c37485145 ChangeLog 1876
+RMD160 2d95f97832984fdfb7108ef56a4ac9510540f9bc ChangeLog 1876
+SHA256 a8895e2d3762954a2349ea76a661630662a5de237fa86a3fd6468c6074dc9417 ChangeLog 1876
 MD5 f78b95ebeddd946ba1f7f1447e6560ca files/digest-xmps-0.2.0-r3 62
-MD5 f78b95ebeddd946ba1f7f1447e6560ca files/digest-xmps-0.2.0-r1 62
+RMD160 97c6dc3b127e4e3b6f3429abc346b2fae6965ead files/digest-xmps-0.2.0-r3 62
+SHA256 c6b532bc0276c62aaeedfa83a73197f4c4f5addd33af7f826662bac00a1ca4eb files/digest-xmps-0.2.0-r3 62
 MD5 66c622a0dcace048c0f920687025d405 files/xmps-0.2.0_motion_comp.c.gentoo.diff 746
-MD5 f78b95ebeddd946ba1f7f1447e6560ca files/digest-xmps-0.2.0-r2 62
+RMD160 acca29f96fbef1c444cc10531d9570e9f5805712 files/xmps-0.2.0_motion_comp.c.gentoo.diff 746
+SHA256 ca5dd7727182efe88f0a6104a90b3401d1e6b4129d4690aff64923b7012dacc8 files/xmps-0.2.0_motion_comp.c.gentoo.diff 746
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
+SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata.xml 225
+MD5 d3ba577b5d808797619c003afc54529a xmps-0.2.0-r3.ebuild 1455
+RMD160 d51e8f2a12d5a9e5951f47bd91908c25e905365e xmps-0.2.0-r3.ebuild 1455
+SHA256 e791ac8aded1a2d1c6403d2e3c6f9e8f1182e7556b8b4c3e89678c2ac147d3e9 xmps-0.2.0-r3.ebuild 1455
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDGjDfj5H05b2HAEkRArVSAKCVwNenUVLxakN2XV299hKpci7swwCfTPCf
-yBp0FGNJ6P+70VLJWNg4b5U=
-=hwAY
+iD4DBQFD81QjAiZjviIA2XgRAvj+AKCA6lf4F38PZavV2JSXJTpeJQZJnACYjtKM
++rbyu/M5LAMzKEwivWZvUQ==
+=/5GC
 -----END PGP SIGNATURE-----
diff --git a/media-video/xmps/files/digest-xmps-0.2.0-r1 b/media-video/xmps/files/digest-xmps-0.2.0-r1
deleted file mode 100644
index c1b94a8b8fac..000000000000
--- a/media-video/xmps/files/digest-xmps-0.2.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 87937db0d26e599003f0e8db4284e16b xmps-0.2.0.tar.gz 809839
diff --git a/media-video/xmps/files/digest-xmps-0.2.0-r2 b/media-video/xmps/files/digest-xmps-0.2.0-r2
deleted file mode 100644
index c1b94a8b8fac..000000000000
--- a/media-video/xmps/files/digest-xmps-0.2.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 87937db0d26e599003f0e8db4284e16b xmps-0.2.0.tar.gz 809839
diff --git a/media-video/xmps/xmps-0.2.0-r1.ebuild b/media-video/xmps/xmps-0.2.0-r1.ebuild
deleted file mode 100644
index 298ce06de965..000000000000
--- a/media-video/xmps/xmps-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xmps/xmps-0.2.0-r1.ebuild,v 1.14 2005/09/03 23:25:04 flameeyes Exp $
-
-IUSE="nls gnome"
-
-DESCRIPTION="X Movie Player System"
-SRC_URI="http://xmps.sourceforge.net/sources/${P}.tar.gz"
-HOMEPAGE="http://xmps.sourceforge.net"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	x86? ( >=dev-lang/nasm-0.98 )
-	>=dev-libs/popt-1.5
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
-
-RDEPEND=">=media-libs/smpeg-0.4.4-r1
-	nls? ( sys-devel/gettext )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-src_compile() {
-
-	local myconf
-
-	use gnome && myconf="--enable-gnome"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	econf ${myconf} || die
-
-	cp Makefile Makefile.orig
-	sed -e "s:\$(bindir)/xmps-config:\$(DESTDIR)\$(bindir)/xmps-config:" \
-		Makefile.orig > Makefile
-
-	make || die
-
-}
-
-src_install () {
-
-	einstall || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-}
diff --git a/media-video/xmps/xmps-0.2.0-r2.ebuild b/media-video/xmps/xmps-0.2.0-r2.ebuild
deleted file mode 100644
index f9e280554c96..000000000000
--- a/media-video/xmps/xmps-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xmps/xmps-0.2.0-r2.ebuild,v 1.7 2005/09/03 23:25:04 flameeyes Exp $
-
-IUSE="nls gnome"
-
-DESCRIPTION="X Movie Player System"
-SRC_URI="http://xmps.sourceforge.net/sources/${P}.tar.gz"
-HOMEPAGE="http://xmps.sourceforge.net"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	>=sys-apps/sed-4
-	x86? ( >=dev-lang/nasm-0.98 )
-	>=dev-libs/popt-1.5
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
-
-RDEPEND=">=media-libs/smpeg-0.4.4-r1
-	nls? ( sys-devel/gettext )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-src_compile() {
-
-	local myconf
-
-	use gnome && myconf="--enable-gnome"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	econf ${myconf} || die "econf failed"
-
-	for file in `find . -iname "Makefile"`;do
-		sed -i -e "s:-Werror::g;s:-ldb1:-ldb:g" \
-			${file} || die "sed-fu failed"
-	done
-
-	sed -i -e "s:\(#ifdef HAVE_CONFIG_H\):#define _LIBC 1\n\1:" \
-		intl/l10nflist.c || die "sed-fu 2 failed"
-
-	sed -i -e "s:\$(bindir)/xmps-config:\$(DESTDIR)\$(bindir)/xmps-config:" \
-		Makefile || die "sed-fu 3 failed"
-
-	emake || die "emake failed"
-
-}
-
-src_install () {
-
-	einstall || die "einstall failed"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-}
diff --git a/media-video/xmps/xmps-0.2.0-r3.ebuild b/media-video/xmps/xmps-0.2.0-r3.ebuild
index 31709d62768b..a5cc2832f425 100644
--- a/media-video/xmps/xmps-0.2.0-r3.ebuild
+++ b/media-video/xmps/xmps-0.2.0-r3.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/xmps/xmps-0.2.0-r3.ebuild,v 1.6 2005/09/03 23:25:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xmps/xmps-0.2.0-r3.ebuild,v 1.7 2006/02/15 16:17:07 flameeyes Exp $
+
+inherit eutils
 
 IUSE="nls gnome"
 
@@ -8,13 +10,14 @@ DESCRIPTION="X Movie Player System"
 SRC_URI="http://xmps.sourceforge.net/sources/${P}.tar.gz"
 HOMEPAGE="http://xmps.sourceforge.net"
 
-DEPEND="=x11-libs/gtk+-1.2*
-	>=sys-apps/sed-4
+RDEPEND="=x11-libs/gtk+-1.2*
 	x86? ( >=dev-lang/nasm-0.98 )
 	>=dev-libs/popt-1.5
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
+	>=media-libs/smpeg-0.4.4-r1
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
+	nls? ( virtual/libintl )"
 
-RDEPEND=">=media-libs/smpeg-0.4.4-r1
+DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 SLOT="0"
@@ -27,7 +30,7 @@ src_unpack() {
 
 	# Fixes compile issues on motion_comp.c (Bug #2822)
 	cd ${S}
-	patch -p1 < ${FILESDIR}/xmps-0.2.0_motion_comp.c.gentoo.diff || die
+	epatch ${FILESDIR}/xmps-0.2.0_motion_comp.c.gentoo.diff
 }
 
 src_compile() {