Version bump, bug #67020.

(Portage version: 2.0.51.19)

9 files changed, 22 insertions, 24 deletions

diff --git a/media-tv/nxtvepg/ChangeLog b/media-tv/nxtvepg/ChangeLog
index e7c800786e21..c56444156e74 100644
--- a/media-tv/nxtvepg/ChangeLog
+++ b/media-tv/nxtvepg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-tv/nxtvepg
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nxtvepg/ChangeLog,v 1.8 2005/01/11 23:17:40 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nxtvepg/ChangeLog,v 1.9 2005/03/29 23:29:26 pylon Exp $
+
+*nxtvepg-2.7.4 (29 Mar 2005)
+
+  29 Mar 2005; Lars Weiler <pylon@gentoo.org> -files/nxtvepg-2.6.0.patch,
+  -files/nxtvepg-2.7.0.patch, +files/nxtvepg-db.patch, metadata.xml,
+  nxtvepg-2.6.0.ebuild, -nxtvepg-2.7.0.ebuild, +nxtvepg-2.7.4.ebuild:
+  Version bump -> bug #67020 and bug #86816
+  Cleaned up patch, as it is used in every version.
 
   12 Jan 2005; Danny van Dyk <kugelfang@gentoo.org> nxtvepg-2.7.0.ebuild:
   Marked ~amd64.
diff --git a/media-tv/nxtvepg/Manifest b/media-tv/nxtvepg/Manifest
index a9602d97de6c..88e69bd5b503 100644
--- a/media-tv/nxtvepg/Manifest
+++ b/media-tv/nxtvepg/Manifest
@@ -1,8 +1,7 @@
 MD5 8e87608daa46c8ab228032c9edf1973c ChangeLog 1721
 MD5 e51950cf1aa2f36ef5d3b9ac2558ca9e metadata.xml 225
-MD5 1195de936e9c12d19874425929dbd789 nxtvepg-2.6.0.ebuild 828
-MD5 6f90290502831194e22598383878d38c nxtvepg-2.7.0.ebuild 841
-MD5 4ba5222865d6ba662bce3c76ddc2b501 files/digest-nxtvepg-2.7.0 66
+MD5 65354118989f9a1de0ff47c94c6ba830 nxtvepg-2.6.0.ebuild 834
+MD5 363854b25225a7d10b44a2606907eaf4 nxtvepg-2.7.4.ebuild 847
 MD5 962b0ca78e750344d1b068c28825e643 files/digest-nxtvepg-2.6.0 66
-MD5 1e4f8db2f6cc3e3a59befb1a6e3e0b2f files/nxtvepg-2.7.0.patch 638
-MD5 1e4f8db2f6cc3e3a59befb1a6e3e0b2f files/nxtvepg-2.6.0.patch 638
+MD5 1e4f8db2f6cc3e3a59befb1a6e3e0b2f files/nxtvepg-db.patch 638
+MD5 f05bfa09b788d16ea1494de5541fe77b files/digest-nxtvepg-2.7.4 66
diff --git a/media-tv/nxtvepg/files/digest-nxtvepg-2.7.0 b/media-tv/nxtvepg/files/digest-nxtvepg-2.7.0
deleted file mode 100644
index 63bdccfdfbb4..000000000000
--- a/media-tv/nxtvepg/files/digest-nxtvepg-2.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ab681506463b7127a5e065363ea13cb9 nxtvepg-2.7.0.tar.gz 1203497
diff --git a/media-tv/nxtvepg/files/digest-nxtvepg-2.7.4 b/media-tv/nxtvepg/files/digest-nxtvepg-2.7.4
new file mode 100644
index 000000000000..67d41c793fef
--- /dev/null
+++ b/media-tv/nxtvepg/files/digest-nxtvepg-2.7.4
@@ -0,0 +1 @@
+MD5 92259e3c8e805fa863b00b8a29791ebd nxtvepg-2.7.4.tar.gz 1235854
diff --git a/media-tv/nxtvepg/files/nxtvepg-2.7.0.patch b/media-tv/nxtvepg/files/nxtvepg-2.7.0.patch
deleted file mode 100644
index 697926044dcd..000000000000
--- a/media-tv/nxtvepg/files/nxtvepg-2.7.0.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.6.0.patch b/media-tv/nxtvepg/files/nxtvepg-db.patch
index 697926044dcd..697926044dcd 100644
--- a/media-tv/nxtvepg/files/nxtvepg-2.6.0.patch
+++ b/media-tv/nxtvepg/files/nxtvepg-db.patch
diff --git a/media-tv/nxtvepg/metadata.xml b/media-tv/nxtvepg/metadata.xml
index 9a027c63f200..b1510cff8662 100644
--- a/media-tv/nxtvepg/metadata.xml
+++ b/media-tv/nxtvepg/metadata.xml
@@ -5,4 +5,8 @@
 <maintainer>
   <email>phosphan@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>pylon@gentoo.org</email>
+  <description>Follow-up maintainer for this package</description>
+</maintainer>
 </pkgmetadata>
diff --git a/media-tv/nxtvepg/nxtvepg-2.6.0.ebuild b/media-tv/nxtvepg/nxtvepg-2.6.0.ebuild
index 80979bebd7ea..77820c854cf8 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-2005 Gentoo Foundation
 # 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.6 2005/01/11 23:17:40 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nxtvepg/nxtvepg-2.6.0.ebuild,v 1.7 2005/03/29 23:29:26 pylon Exp $
 
 inherit eutils
 
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}.patch
+	epatch ${FILESDIR}/nxtvepg-db.patch
 }
 
 src_compile() {
diff --git a/media-tv/nxtvepg/nxtvepg-2.7.0.ebuild b/media-tv/nxtvepg/nxtvepg-2.7.4.ebuild
index 97815c5a93fe..886b258ab8e1 100644
--- a/media-tv/nxtvepg/nxtvepg-2.7.0.ebuild
+++ b/media-tv/nxtvepg/nxtvepg-2.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nxtvepg/nxtvepg-2.7.0.ebuild,v 1.5 2005/01/11 23:17:41 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nxtvepg/nxtvepg-2.7.4.ebuild,v 1.1 2005/03/29 23:29:26 pylon Exp $
 
 inherit eutils
 
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}.patch
+	epatch ${FILESDIR}/nxtvepg-db.patch
 }
 
 src_compile() {