Add modular x dependencies, general ebuild cleanup.

Package-Manager: portage-2.1_pre1

3 files changed, 29 insertions, 22 deletions

diff --git a/media-libs/zvbi/ChangeLog b/media-libs/zvbi/ChangeLog
index 62aed749ecd1..ba963f615229 100644
--- a/media-libs/zvbi/ChangeLog
+++ b/media-libs/zvbi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/zvbi
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/ChangeLog,v 1.14 2005/12/20 04:37:16 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/ChangeLog,v 1.15 2005/12/21 22:24:52 flameeyes Exp $
+
+  21 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> zvbi-0.2.17.ebuild:
+  Add modular x dependencies, general ebuild cleanup.
 
 *zvbi-0.2.17 (20 Dec 2005)
 
diff --git a/media-libs/zvbi/Manifest b/media-libs/zvbi/Manifest
index 1737de6a3f09..d71affb20ba9 100644
--- a/media-libs/zvbi/Manifest
+++ b/media-libs/zvbi/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d590914cdde2d3a35ca56ed5533c4932 ChangeLog 1577
+MD5 9292c37314914f9ea50dc5ad8cdecaa7 ChangeLog 1709
 MD5 baedca8ae962822d7a263fbe40f5aa3a files/digest-zvbi-0.2.1-r1 63
 MD5 d20e27b8eb350da00bc6ee0f3343ddbd files/digest-zvbi-0.2.16 64
 MD5 b7d8e754c8a8b426dd474fd0c6fbbef2 files/digest-zvbi-0.2.17 64
@@ -10,13 +10,13 @@ MD5 357f324ad4e5dbc6e1e2f6c6b0970e0c files/digest-zvbi-0.2.8 63
 MD5 25406e1b2415880e9e5ac5a4df592573 metadata.xml 288
 MD5 3e4f198084c2cbad758071f21e0165e8 zvbi-0.2.1-r1.ebuild 816
 MD5 99dd6cabf879f57730ea3cfa81183f2b zvbi-0.2.16.ebuild 1026
-MD5 f737bf495090a2dc713b5433dccd2de0 zvbi-0.2.17.ebuild 1023
+MD5 73be63645ceb90bea8b6e3efef8a2cfb zvbi-0.2.17.ebuild 1011
 MD5 9d1ebb5970cfa6cddafb754e79a0a53a zvbi-0.2.4.ebuild 828
 MD5 c969c96ce2737f4d20c63453b1af2747 zvbi-0.2.8.ebuild 777
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDp4ror2QksT29OyARAvUjAJ44u6IYDwPpluC2Wi/eNwkJAhyBrwCdGty2
-QHs6Eza90mz+Ks5y/HZjXu8=
-=7EnS
+iD8DBQFDqdZJAiZjviIA2XgRAkD3AKDIBlz0tAswIIBxns+AhjyOSm+jlACg5rFf
+eEBk5jkEtB7WIm4+XNTfuio=
+=BE1H
 -----END PGP SIGNATURE-----
diff --git a/media-libs/zvbi/zvbi-0.2.17.ebuild b/media-libs/zvbi/zvbi-0.2.17.ebuild
index 07a7111bbbf8..51394a198094 100644
--- a/media-libs/zvbi/zvbi-0.2.17.ebuild
+++ b/media-libs/zvbi/zvbi-0.2.17.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-libs/zvbi/zvbi-0.2.17.ebuild,v 1.1 2005/12/20 04:37:16 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.17.ebuild,v 1.2 2005/12/21 22:24:52 flameeyes Exp $
 
 IUSE="X nls v4l dvb doc"
 
@@ -12,28 +12,32 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~alpha ~ia64"
 
-DEPEND="X? ( virtual/x11 )
+RDEPEND="X? ( || ( x11-libs/libX11 virtual/x11 ) )
+	media-libs/libpng
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	X? ( || ( (
+			x11-libs/libXt
+			x11-proto/xproto
+		) virtual/x11 ) )
+	virtual/os-headers
 	nls? ( sys-devel/gettext )
 	doc? ( app-doc/doxygen )"
 
 src_compile() {
-	local myconf="`use_enable nls` \
-		`use_enable v4l` \
-		`use_enable dvb` "
-
-	use X && myconf="${myconf} --with-x"
-	use X || myconf="${myconf} --without-x"
-
-	econf ${myconf} || die
-
-	cp doc/zdoc-scan doc/zdoc-scan.orig
-	sed -e 's:usr/local/share/gtk-doc:usr/share/gtk-doc:' \
-		doc/zdoc-scan.orig > doc/zdoc-scan
-	emake || die
+	econf \
+		$(use_enable nls) \
+		$(use_enable v4l) \
+		$(use_enable dvb) \
+		$(use_with X x) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
 }
 
 src_install () {
 	einstall || die
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 	use doc && dohtml -a png,gif,html,css doc/html/*
 }