Version bump; fixes tcl8.5-compatibility; bug #212682 and #173467.

Probably the tcl/tk-dependency must be fixed to 8.5, but that version is
still masked.
Package-Manager: portage-2.1.4.4

8 files changed, 127 insertions, 87 deletions

diff --git a/media-tv/nxtvepg/ChangeLog b/media-tv/nxtvepg/ChangeLog
index ab6b691fb1f6..adecc768f48f 100644
--- a/media-tv/nxtvepg/ChangeLog
+++ b/media-tv/nxtvepg/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-tv/nxtvepg
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nxtvepg/ChangeLog,v 1.16 2007/11/27 10:42:59 zzam Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nxtvepg/ChangeLog,v 1.17 2008/03/30 14:57:58 pylon Exp $
+
+*nxtvepg-2.8.0 (30 Mar 2008)
+
+  30 Mar 2008; Lars Weiler <pylon@gentoo.org> +files/nxtvepg-tcl8.5.patch,
+  +files/nxtvepg-daemon-install.patch, +files/nxtvepg-unicode.patch,
+  -nxtvepg-2.7.6.ebuild, -nxtvepg-2.7.7.ebuild, +nxtvepg-2.8.0.ebuild:
+  Version bump; fixes tcl8.5-compatibility; bug #212682 and #173467.
+  Probably the tcl/tk-dependency must be fixed to 8.5, but that version is
+  still masked.
 
   27 Nov 2007; Matthias Schwarzott <zzam@gentoo.org> nxtvepg-2.7.5.ebuild:
   Fixed quoting.
diff --git a/media-tv/nxtvepg/Manifest b/media-tv/nxtvepg/Manifest
index 944f7c334ab5..6f51635d3c96 100644
--- a/media-tv/nxtvepg/Manifest
+++ b/media-tv/nxtvepg/Manifest
@@ -1,9 +1,10 @@
+AUX nxtvepg-daemon-install.patch 1222 RMD160 d18b2cc98ea98de1fdee1cb94df445fbb2a2d0ac SHA1 6f7a2f07cbdbf7554a11ba53a033108406efca37 SHA256 a1d5057819bced463f9968a410dd5e2be0de747883dc857a3ec1e5086a24a211
 AUX nxtvepg-db.patch 638 RMD160 e176ec41e59eaa32dc082f94f770bbd3a3840f86 SHA1 5e91fef0a8dd7bab43bdde61ed8dc605a7fc6e6f SHA256 444a357b351247542ee45296a2aff505e264458cb51003602b428f9811cbad14
+AUX nxtvepg-tcl8.5.patch 585 RMD160 9a94e3cc6f97a655944b2ef26251d93fc83b9b96 SHA1 523837e07a3fad6621f9882f6f88fc41d3cfefb1 SHA256 bccca61aef474dae8bb68654b00dbc18137f180afc1cd1ae1b1fd860c542e4f0
+AUX nxtvepg-unicode.patch 454 RMD160 9d4e6348f85fa669521a2adfc835bc969c6d5da8 SHA1 1f248654176800ce2b3fa027da71a0ad4eb41f64 SHA256 7c25adaf5c12c73abd3773edb210003f2785daee945fe44ae0a633234278f9f1
 DIST nxtvepg-2.7.5.tar.gz 1241068 RMD160 f4f8019ed31d30191985e773fbf2f24bc4635bec SHA1 a85d94868e33f0fb79b66b36e56ceb3a4850cf76 SHA256 3d96e58ca6c675ba793c6c4433e32c941327d802dcbaf98a1f1e5d5eba42321b
-DIST nxtvepg-2.7.6.tar.gz 1430471 RMD160 cd90477e4cbbed7a3c3ba0c93295a51fbd299922 SHA1 02008ff681377367b4b5a9d7734de9471a69e5de SHA256 2048df1ff9ca2d7d76639318f1a7bc3814b905e30fd3a109e6eae43c1bf6acf5
-DIST nxtvepg-2.7.7.tar.gz 1480288 RMD160 286344a1f7f0f8fc6f17d92daf234960a6c821cf SHA1 4e847db9fa145600587b104e686b836bf8324d75 SHA256 49df9848c81620751b34ebebde7196a745228931e86f9bee115fd2d34a08d0d8
+DIST nxtvepg-2.8.0.tar.gz 1821231 RMD160 c40b1b6eaf470ccb03d4909a68b01cffab3ac9cd SHA1 e4fffd769fc3f84d42bda0c1a53cba081f684de0 SHA256 d762581a7335dffe84d9680d02e17c7c00d04f1f5a9e51b8ac0f411f570f7c71
 EBUILD nxtvepg-2.7.5.ebuild 924 RMD160 ad22262284ea63b51e4a7495e649530703d5cd2e SHA1 f1174a2602447f664a26db4965da30a681f4d565 SHA256 19644874e163fafcba3c27ae771b3dae76f17223aca9d86042c44e651b77cdaf
-EBUILD nxtvepg-2.7.6.ebuild 965 RMD160 0e24d329f3a38fe9c1c51d2ec6a7a5922ace654e SHA1 77eaadabe72dd9b984bc53b9e0aa8d47d637ac06 SHA256 d6861b03cea0b2c275c0f04418f2bff8ea6d3d47c893f803e0c1eadcc22ee58b
-EBUILD nxtvepg-2.7.7.ebuild 962 RMD160 40f6790249c9a4471de1df9b0fbfab98dbef44ed SHA1 864bef6ac83da17bd6883824ce6e78b7d2dca7c1 SHA256 83871fb36b844f3b59a8fbb751a24c82328fe930829618f2896e785f027979b0
-MISC ChangeLog 3106 RMD160 b085280990983d32a508f6aafb856984b84cf6c0 SHA1 ba4f1e663c813e8665436dcad70d5ba663f9086a SHA256 d1b59b771942b20c69527197d715df3d87496d9fffdee78c719bf48971907dab
+EBUILD nxtvepg-2.8.0.ebuild 1459 RMD160 5816be1fc88fa3594c4b5dfac249343207359176 SHA1 845590f5fd9d032b5e5d1cee1f1010619df881df SHA256 81e58f76b4c13faca16dd9d602511848804dce433882a3a352f7a432c3c59374
+MISC ChangeLog 3513 RMD160 79c8fe1746d9c460adef34a7cb879b400b5c41a7 SHA1 80cae59ef2cee424d635fb3e6596b8f3b8dd2779 SHA256 5ed8ae75c055b334383d043c5b77385de4db7127476084e768d9eb608933827f
 MISC metadata.xml 384 RMD160 1aaa1f3719f1ebc311eb6187734be84a4520d471 SHA1 0760e57b7ca2bd40b79384c4ab35f7dbe259a5d4 SHA256 5ed4eb9a4755fe75f4cc791e690a477a66b917b8efde03e2c35071da4d7173ce
diff --git a/media-tv/nxtvepg/files/nxtvepg-daemon-install.patch b/media-tv/nxtvepg/files/nxtvepg-daemon-install.patch
new file mode 100644
index 000000000000..870926dec2e5
--- /dev/null
+++ b/media-tv/nxtvepg/files/nxtvepg-daemon-install.patch
@@ -0,0 +1,33 @@
+diff -Naur nxtvepg-2.8.0.orig/Makefile nxtvepg-2.8.0/Makefile
+--- nxtvepg-2.8.0.orig/Makefile	2008-03-30 16:19:54.000000000 +0200
++++ nxtvepg-2.8.0/Makefile	2008-03-30 16:21:00.000000000 +0200
+@@ -209,8 +209,8 @@
+ $(BUILD_DIR)/vbirec: $(VBIREC_OBJS)
+ 	$(CC) -o $@ $(VBIREC_OBJS) $(LDFLAGS) $(GUILIBS) $(ACQLIBS)
+ 
+-.PHONY: install
+-install: daemon Nxtvepg.ad nxtvepgd.1
++.PHONY: install-common
++install-common: daemon nxtvepgd.1
+ 	test -d $(bindir) || install -d $(bindir)
+ 	test -d $(mandir) || install -d $(mandir)
+ 	test -d $(resdir)/app-defaults || install -d $(resdir)/app-defaults
+@@ -218,10 +218,16 @@
+ 	test -d $(INST_DB_DIR) || install -d $(INST_DB_DIR)
+ 	chmod $(INST_DB_PERM) $(INST_DB_DIR)
+ endif
+-	install -c -m 0755 $(BUILD_DIR)/nxtvepg $(bindir)
+-	install -c -m 0755 $(BUILD_DIR)/nxtvepgd $(bindir)
+ 	install -c -m 0644 nxtvepg.1   $(mandir)
++
++.PHONY: install-daemon
++install-daemon: install-common
++	install -c -m 0755 $(BUILD_DIR)/nxtvepgd $(bindir)
+ 	install -c -m 0644 nxtvepgd.1  $(mandir)
++
++.PHONY: install
++install: install-common install-daemon Nxtvepg.ad
++	install -c -m 0755 $(BUILD_DIR)/nxtvepg $(bindir)
+ 	install -c -m 0644 Nxtvepg.ad  $(resdir)/app-defaults/Nxtvepg
+ 
+ .SUFFIXES: .c .o .tcl
diff --git a/media-tv/nxtvepg/files/nxtvepg-tcl8.5.patch b/media-tv/nxtvepg/files/nxtvepg-tcl8.5.patch
new file mode 100644
index 000000000000..662fe75e4577
--- /dev/null
+++ b/media-tv/nxtvepg/files/nxtvepg-tcl8.5.patch
@@ -0,0 +1,14 @@
+diff -Naur nxtvepg-2.8.0.orig/Makefile nxtvepg-2.8.0/Makefile
+--- nxtvepg-2.8.0.orig/Makefile	2008-03-30 16:35:42.000000000 +0200
++++ nxtvepg-2.8.0/Makefile	2008-03-30 16:35:54.000000000 +0200
+@@ -58,8 +58,8 @@
+ YACC    = /usr/bin/yacc
+ 
+ # select Tcl/Tk version (8.5 recommended due to modernized widget appearence)
+-TCL_VER := $(shell echo 'puts [package require Tcl]' | tclsh)
+-#TCL_VER = 8.5
++#TCL_VER := $(shell echo 'puts [package require Tcl]' | tclsh)
++TCL_VER = 8.5
+ 
+ ifeq ($(shell test -d /usr/include/tcl$(TCL_VER) && echo YES),YES)
+ INCS   += -I/usr/include/tcl$(TCL_VER)
diff --git a/media-tv/nxtvepg/files/nxtvepg-unicode.patch b/media-tv/nxtvepg/files/nxtvepg-unicode.patch
new file mode 100644
index 000000000000..861da3789390
--- /dev/null
+++ b/media-tv/nxtvepg/files/nxtvepg-unicode.patch
@@ -0,0 +1,12 @@
+diff -Naur nxtvepg-2.8.0.orig/Makefile nxtvepg-2.8.0/Makefile
+--- nxtvepg-2.8.0.orig/Makefile	2008-03-30 16:36:52.000000000 +0200
++++ nxtvepg-2.8.0/Makefile	2008-03-30 16:36:58.000000000 +0200
+@@ -86,7 +86,7 @@
+ ACQLIBS += -lpthread
+ 
+ # use UTF-8 internally instead of Latin-1 (EXPERIMENTAL)
+-#DEFS   += -DUSE_UTF8 -DXMLTV_OUTPUT_UTF8
++DEFS   += -DUSE_UTF8 -DXMLTV_OUTPUT_UTF8
+ 
+ # enable support for importing XMLTV files
+ DEFS   += -DUSE_XMLTV_IMPORT
diff --git a/media-tv/nxtvepg/nxtvepg-2.7.6.ebuild b/media-tv/nxtvepg/nxtvepg-2.7.6.ebuild
deleted file mode 100644
index 3e9e11846f7d..000000000000
--- a/media-tv/nxtvepg/nxtvepg-2.7.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nxtvepg/nxtvepg-2.7.6.ebuild,v 1.3 2006/12/02 09:50:28 dev-zero Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="receive and browse free TV programme listings via bttv for tv networks in Europe"
-HOMEPAGE="http://nxtvepg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/tcl-8.0
-	>=dev-lang/tk-8.0
-	x11-libs/libX11
-	x11-libs/libXmu"
-
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	sys-kernel/linux-headers
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/nxtvepg-db.patch"
-}
-
-src_compile() {
-	emake -j1 CC=$(tc-getCC) prefix="/usr" || die "emake failed"
-}
-
-src_install() {
-	emake ROOT="${D}" prefix="/usr" install || die "emake install failed"
-	dodoc README CHANGES TODO
-	dohtml manual*.html
-}
diff --git a/media-tv/nxtvepg/nxtvepg-2.7.7.ebuild b/media-tv/nxtvepg/nxtvepg-2.7.7.ebuild
deleted file mode 100644
index 7ea1b99be24b..000000000000
--- a/media-tv/nxtvepg/nxtvepg-2.7.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nxtvepg/nxtvepg-2.7.7.ebuild,v 1.1 2007/07/07 19:01:51 pylon Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="receive and browse free TV programme listings via bttv for tv networks in Europe"
-HOMEPAGE="http://nxtvepg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/tcl-8.0
-	>=dev-lang/tk-8.0
-	x11-libs/libX11
-	x11-libs/libXmu"
-
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	sys-kernel/linux-headers
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/nxtvepg-db.patch"
-}
-
-src_compile() {
-	emake -j1 CC=$(tc-getCC) prefix="/usr" || die "emake failed"
-}
-
-src_install() {
-	emake ROOT="${D}" prefix="/usr" install || die "emake install failed"
-	dodoc README CHANGES TODO
-	dohtml manual*.html
-}
diff --git a/media-tv/nxtvepg/nxtvepg-2.8.0.ebuild b/media-tv/nxtvepg/nxtvepg-2.8.0.ebuild
new file mode 100644
index 000000000000..2aa3436bd9c1
--- /dev/null
+++ b/media-tv/nxtvepg/nxtvepg-2.8.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nxtvepg/nxtvepg-2.8.0.ebuild,v 1.1 2008/03/30 14:57:58 pylon Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="receive and browse free TV programme listings via bttv for tv networks in Europe"
+HOMEPAGE="http://nxtvepg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X unicode"
+
+RDEPEND="X? ( >=dev-lang/tcl-8
+	 	>=dev-lang/tk-8
+		x11-libs/libX11
+		x11-libs/libXmu )"
+
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	sys-kernel/linux-headers
+	X? ( x11-proto/xproto )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/nxtvepg-db.patch" || die "db patch failed"
+	epatch "${FILESDIR}/nxtvepg-daemon-install.patch" || die "daemon patch failed"
+	epatch "${FILESDIR}/nxtvepg-tcl8.5.patch" || die "tcl-8.5 patch failed"
+	( use unicode && epatch "${FILESDIR}/nxtvepg-unicode.patch" ) || die "unicode patch failed"
+}
+
+src_compile() {
+	if use X; then
+		emake -j1 CC=$(tc-getCC) prefix="/usr" || die "emake failed"
+	else
+		emake -j1 CC=$(tc-getCC) prefix="/usr" daemon || die "emake failed"
+	fi
+}
+
+src_install() {
+	if use X; then
+		emake ROOT="${D}" prefix="/usr" install || die "emake install failed"
+	else
+		emake ROOT="${D}" prefix="/usr" install-daemon || die "emake install failed"
+	fi
+	dodoc README CHANGES TODO
+	dohtml manual*.html
+}