bug 64173

(Portage version: 2.0.51.22-r2)

5 files changed, 69 insertions, 15 deletions

diff --git a/media-tv/zapping/ChangeLog b/media-tv/zapping/ChangeLog
index eb3f38a13f5a..92a0d2989095 100644
--- a/media-tv/zapping/ChangeLog
+++ b/media-tv/zapping/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/zapping
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/zapping/ChangeLog,v 1.11 2005/08/30 00:06:13 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/zapping/ChangeLog,v 1.12 2005/08/30 01:07:17 vanquirius Exp $
+
+*zapping-0.9.6 (30 Aug 2005)
+
+  30 Aug 2005; Marcelo Goes <vanquirius@gentoo.org> zapping-0.7.ebuild,
+  +zapping-0.9.6.ebuild:
+  Some ebuild fixes and a version bump for bug 64173. Thanks to everyone
+  participating in the bug.
 
   30 Aug 2005; Marcelo Goes <vanquirius@gentoo.org> zapping-0.7.ebuild:
   Add missing esound dependency and fix scrollkeeper violations for bug 98968.
diff --git a/media-tv/zapping/Manifest b/media-tv/zapping/Manifest
index b1b250fda1f1..751a66124962 100644
--- a/media-tv/zapping/Manifest
+++ b/media-tv/zapping/Manifest
@@ -1,6 +1,7 @@
 MD5 b717c77d78a0c80f2018a60454ebc988 zapping-0.6.8.ebuild 1578
 MD5 1b7e234ef0400e48cabcfaa264fb7102 zapping-0.6.7.ebuild 1578
-MD5 e9445631a5dedf175ebedebed6276de4 zapping-0.7.ebuild 1674
+MD5 e6be05bf0cd8ee09e0f5917b08786618 zapping-0.9.6.ebuild 1307
+MD5 fa215840447c025e2c9a97fda3d06eea zapping-0.7.ebuild 1558
 MD5 a26e584eeae970cf42aa0be114f8d782 ChangeLog 3062
 MD5 25406e1b2415880e9e5ac5a4df592573 metadata.xml 288
 MD5 6a7dba6be0ba99e56ecd203568e5bad6 zapping-0.6.6.ebuild 1575
@@ -8,3 +9,4 @@ MD5 e143772d473200c54f049b11077e7021 files/digest-zapping-0.7 65
 MD5 7e8ba0ca527255f8447bdc6257875a69 files/digest-zapping-0.6.6 67
 MD5 6efdc1415977230537c69acb97977a5b files/digest-zapping-0.6.7 67
 MD5 70fb30116299da91bfa27deac7cf483e files/digest-zapping-0.6.8 67
+MD5 88de534caf45006cc167253e7431c652 files/digest-zapping-0.9.6 67
diff --git a/media-tv/zapping/files/digest-zapping-0.9.6 b/media-tv/zapping/files/digest-zapping-0.9.6
new file mode 100644
index 000000000000..df6f0953b928
--- /dev/null
+++ b/media-tv/zapping/files/digest-zapping-0.9.6
@@ -0,0 +1 @@
+MD5 8306775c6a11de4d72345b5eee970ea6 zapping-0.9.6.tar.bz2 1529162
diff --git a/media-tv/zapping/zapping-0.7.ebuild b/media-tv/zapping/zapping-0.7.ebuild
index 30272498ca6e..e8e9d3984b36 100644
--- a/media-tv/zapping/zapping-0.7.ebuild
+++ b/media-tv/zapping/zapping-0.7.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/zapping/zapping-0.7.ebuild,v 1.4 2005/08/30 00:06:13 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/zapping/zapping-0.7.ebuild,v 1.5 2005/08/30 01:07:17 vanquirius Exp $
 
 inherit gnome2
 
@@ -22,7 +22,8 @@ DEPEND=">=gnome-base/libgnomeui-2.0
 	>=media-libs/zvbi-0.2
 	>=media-libs/rte-0.5.2
 	>=media-sound/esound-0.2.34
-	app-text/scrollkeeper"
+	app-text/scrollkeeper
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}; cd ${S}
@@ -31,20 +32,13 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-
-	use X \
-		&& myconf="${myconf} --with-x" \
-		|| myconf="${myconf} --without-x"
-
 	econf `use_enable nls` \
 		`use_enable pam` \
-		${myconf} || die "econf failed"
+		`use_with X x` || die "econf failed"
 
-	mv src/Makefile src/Makefile.orig
-	sed -e "s:\(INCLUDES = \$(COMMON_INCLUDES)\):\1 -I/usr/include/libglade-1.0 -I/usr/include/gdk-pixbuf-1.0:" \
-		src/Makefile.orig > src/Makefile
-	make || die "make failed"
+	sed -i -e "s:\(INCLUDES = \$(COMMON_INCLUDES)\):\1 -I/usr/include/libglade-1.0 -I/usr/include/gdk-pixbuf-1.0:" \
+		src/Makefile || die
+	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/media-tv/zapping/zapping-0.9.6.ebuild b/media-tv/zapping/zapping-0.9.6.ebuild
new file mode 100644
index 000000000000..5f7be0a8c00f
--- /dev/null
+++ b/media-tv/zapping/zapping-0.9.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/zapping/zapping-0.9.6.ebuild,v 1.1 2005/08/30 01:07:17 vanquirius Exp $
+
+inherit gnome2
+
+DESCRIPTION="TV- and VBI- viewer for the Gnome environment"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://zapping.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="nls pam X"
+
+DEPEND=">=gnome-base/libgnomeui-2.0
+	>=gnome-base/libglade-2.0
+	>=gnome-base/gconf-2.4
+	>=x11-libs/gtk+-2.0.0
+	dev-libs/libxml2
+	>=sys-devel/gettext-0.10.36
+	>=media-libs/zvbi-0.2
+	>=media-libs/rte-0.5.2
+	>=media-sound/esound-0.2.34
+	app-text/scrollkeeper
+	>=sys-apps/sed-4
+	>=media-libs/zvbi-0.2.9"
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+	# fix scrollkeeper violations, bug 98968
+	gnome2_omf_fix {.,*,*/*}/Makefile.in
+}
+
+src_compile() {
+	econf `use_enable nls` \
+		`use_enable pam` \
+		`use_with X x` || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+pkg_preinst() {
+	rm ${D}/usr/bin/zapzilla
+	dosym /usr/bin/zapping /usr/bin/zapzilla
+	# thx to Andreas Kotowicz <koto@mynetix.de> for mailing me this fix:
+	rm ${D}/usr/bin/zapping_setup_fb
+	dobin zapping_setup_fb/zapping_setup_fb
+	dodoc AUTHORS BUGS ChangeLog NEWS README README.plugins THANKS TODO
+}