Version bump, cleanup

8 files changed, 24 insertions, 29 deletions

diff --git a/media-tv/nxtvepg/ChangeLog b/media-tv/nxtvepg/ChangeLog
index 6d4a8174b939..216ba55f643c 100644
--- a/media-tv/nxtvepg/ChangeLog
+++ b/media-tv/nxtvepg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/nxtvepg
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nxtvepg/ChangeLog,v 1.4 2003/10/17 12:32:23 phosphan Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nxtvepg/ChangeLog,v 1.5 2004/04/15 07:03:03 phosphan Exp $
+
+*nxtvepg-2.7.0 (05 Apr 2004)
+
+  05 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> nxtvepg-2.5.2.ebuild,
+  nxtvepg-2.7.0.ebuild, files/nxtvepg-2.5.1.patch, files/nxtvepg-2.5.2.patch,
+  files/nxtvepg-2.7.0.patch:
+  Version bump, cleanup
 
 *nxtvepg-2.6.0 (17 Oct 2003)
 
diff --git a/media-tv/nxtvepg/Manifest b/media-tv/nxtvepg/Manifest
index 81d50e2ce3a7..7e273ecd93df 100644
--- a/media-tv/nxtvepg/Manifest
+++ b/media-tv/nxtvepg/Manifest
@@ -1,9 +1,8 @@
-MD5 990e2b5787996c6571891c914122e1fc nxtvepg-2.5.2.ebuild 820
-MD5 8b6d0ae3402a27448d1e17e23d60002e nxtvepg-2.6.0.ebuild 829
-MD5 1bd78eb7e3ec7dcb340d2e4ff89688ab ChangeLog 1315
+MD5 26b15e4fd95ce9d3d27aee351bef0b7a nxtvepg-2.6.0.ebuild 829
+MD5 bdffe69e6366fb82fb75498c07003196 nxtvepg-2.7.0.ebuild 830
+MD5 4afdd97eb176ecc25d0d11741e965d8d ChangeLog 1552
 MD5 e51950cf1aa2f36ef5d3b9ac2558ca9e metadata.xml 225
-MD5 7c0b2d6a957373cc13dbca7a5c6c9bb0 files/digest-nxtvepg-2.5.2 66
 MD5 962b0ca78e750344d1b068c28825e643 files/digest-nxtvepg-2.6.0 66
-MD5 1e4f8db2f6cc3e3a59befb1a6e3e0b2f files/nxtvepg-2.5.1.patch 638
-MD5 1e4f8db2f6cc3e3a59befb1a6e3e0b2f files/nxtvepg-2.5.2.patch 638
+MD5 4ba5222865d6ba662bce3c76ddc2b501 files/digest-nxtvepg-2.7.0 66
+MD5 1e4f8db2f6cc3e3a59befb1a6e3e0b2f files/nxtvepg-2.7.0.patch 638
 MD5 1e4f8db2f6cc3e3a59befb1a6e3e0b2f files/nxtvepg-2.6.0.patch 638
diff --git a/media-tv/nxtvepg/files/digest-nxtvepg-2.5.2 b/media-tv/nxtvepg/files/digest-nxtvepg-2.5.2
deleted file mode 100644
index 6040d147b1c9..000000000000
--- a/media-tv/nxtvepg/files/digest-nxtvepg-2.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb81f15e8e8bcb2fd1185946902b72e0 nxtvepg-2.5.2.tar.gz 1007291
diff --git a/media-tv/nxtvepg/files/digest-nxtvepg-2.7.0 b/media-tv/nxtvepg/files/digest-nxtvepg-2.7.0
new file mode 100644
index 000000000000..63bdccfdfbb4
--- /dev/null
+++ b/media-tv/nxtvepg/files/digest-nxtvepg-2.7.0
@@ -0,0 +1 @@
+MD5 ab681506463b7127a5e065363ea13cb9 nxtvepg-2.7.0.tar.gz 1203497
diff --git a/media-tv/nxtvepg/files/nxtvepg-2.5.2.patch b/media-tv/nxtvepg/files/nxtvepg-2.5.2.patch
deleted file mode 100644
index 697926044dcd..000000000000
--- a/media-tv/nxtvepg/files/nxtvepg-2.5.2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile    2003-04-21 00:14:50.000000000 +0200
-+++ Makefile.new        2003-05-09 14:39:11.000000000 +0200
-@@ -92,8 +92,8 @@
- # The database directory can be either in the user's $HOME (or relative to any
- # other env variable) or at a global place like /var/spool (world-writable)
- # -> uncomment 2 lines below to put the databases in the user's home
--#USER_DBDIR  = .nxtvdb
--#DEFS       += -DEPG_DB_ENV=\"HOME\" -DEPG_DB_DIR=\"$(USER_DBDIR)\"
-+USER_DBDIR  = .nxtvdb
-+DEFS       += -DEPG_DB_ENV=\"HOME\" -DEPG_DB_DIR=\"$(USER_DBDIR)\"
- ifndef USER_DBDIR
- SYS_DBDIR    = /usr/tmp/nxtvdb
- DEFS        += -DEPG_DB_DIR=\"$(SYS_DBDIR)\"
diff --git a/media-tv/nxtvepg/files/nxtvepg-2.5.1.patch b/media-tv/nxtvepg/files/nxtvepg-2.7.0.patch
index 697926044dcd..697926044dcd 100644
--- a/media-tv/nxtvepg/files/nxtvepg-2.5.1.patch
+++ b/media-tv/nxtvepg/files/nxtvepg-2.7.0.patch
diff --git a/media-tv/nxtvepg/nxtvepg-2.6.0.ebuild b/media-tv/nxtvepg/nxtvepg-2.6.0.ebuild
index 3a25e0bb0cc3..da9e602bba4d 100644
--- a/media-tv/nxtvepg/nxtvepg-2.6.0.ebuild
+++ b/media-tv/nxtvepg/nxtvepg-2.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nxtvepg/nxtvepg-2.6.0.ebuild,v 1.2 2003/12/29 08:48:58 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nxtvepg/nxtvepg-2.6.0.ebuild,v 1.3 2004/04/15 07:03:03 phosphan Exp $
 
 inherit eutils
 
diff --git a/media-tv/nxtvepg/nxtvepg-2.5.2.ebuild b/media-tv/nxtvepg/nxtvepg-2.7.0.ebuild
index 284f351a11e6..4dbb4897d7af 100644
--- a/media-tv/nxtvepg/nxtvepg-2.5.2.ebuild
+++ b/media-tv/nxtvepg/nxtvepg-2.7.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nxtvepg/nxtvepg-2.5.2.ebuild,v 1.3 2003/09/08 08:49:17 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nxtvepg/nxtvepg-2.7.0.ebuild,v 1.1 2004/04/15 07:03:03 phosphan Exp $
+
+inherit eutils
 
 DESCRIPTION="receive and browse free TV programme listings via bttv for tv networks in Europe"
 HOMEPAGE="http://nxtvepg.sourceforge.net/"
@@ -8,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 
 RDEPEND=">=dev-lang/tcl-8.0
 	>=dev-lang/tk-8.0"
@@ -19,7 +21,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}.patch
+	epatch ${FILESDIR}/${P}.patch
 }
 
 src_compile() {
@@ -27,7 +29,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall resdir="${D}/usr/X11R6/lib/X11" || die "install failed"
+	make install ROOT=${D} prefix="/usr" || die "install failed"
 	dodoc README COPYRIGHT CHANGES TODO
 	dohtml manual.html
 }