Version bump and ebuild cleanup; add missing xinerama dependency.

Package-Manager: portage-2529-svn

5 files changed, 244 insertions, 5 deletions

diff --git a/media-tv/xdtv/ChangeLog b/media-tv/xdtv/ChangeLog
index 98f57f39ca61..8ad1211ec6e1 100644
--- a/media-tv/xdtv/ChangeLog
+++ b/media-tv/xdtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/xdtv
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.14 2006/01/08 12:25:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.15 2006/01/28 00:02:50 flameeyes Exp $
+
+*xdtv-2.3.0 (28 Jan 2006)
+
+  28 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/xdtv-2.3.0-setXid.patch, +xdtv-2.3.0.ebuild:
+  Version bump and ebuild cleanup; add missing xinerama dependency.
 
 *xdtv-2.2.0-r2 (08 Jan 2006)
 
diff --git a/media-tv/xdtv/Manifest b/media-tv/xdtv/Manifest
index 90b87a3a166d..7a803905b1c0 100644
--- a/media-tv/xdtv/Manifest
+++ b/media-tv/xdtv/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6fdf8a3b41aa23fe7906126caef8d5f3 ChangeLog 2386
+MD5 ebec0ea7ac8001fc9d00939edb125a77 ChangeLog 2589
 MD5 1e0e7da6d22eed35ae25e84d5b0dcad7 files/digest-xdtv-2.2.0-r1 1777
 MD5 1e0e7da6d22eed35ae25e84d5b0dcad7 files/digest-xdtv-2.2.0-r2 1777
+MD5 105cbb4602d01cda7806427fa31dccdf files/digest-xdtv-2.3.0 2403
 MD5 26b0db8fc43f5f4d60fa824a4ed54082 files/xdtv-2.2.0-memcpy.patch 10418
 MD5 1e75abf70d879a7e721d60a1ca927fd8 files/xdtv-2.2.0-setXid.patch 481
+MD5 109eefe229d78684737dd214b4ccde82 files/xdtv-2.3.0-setXid.patch 470
 MD5 0dfc4d0a0cad3dc6b761593f69ac917b metadata.xml 252
 MD5 e7b3b7903862a9661ee15fc6391e5f93 xdtv-2.2.0-r1.ebuild 6971
 MD5 624e2e45a5120cc89fc572c4e01ef494 xdtv-2.2.0-r2.ebuild 7005
+MD5 44e83e58b7bd18d7015d54acb6a56776 xdtv-2.3.0.ebuild 5066
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDwQTIAiZjviIA2XgRAvl4AJ0XASxyJSLNUn0Xn6tekKXeMvUIEQCggAp4
-iqLv3qULkG4pYgLdSh3BsiI=
-=a90q
+iD8DBQFD2rTVAiZjviIA2XgRAlu2AJ9KL+cze2krl9C50xKbXUKPWYetvgCgizx0
+RYF4PWuej9oqsO24PY60800=
+=XrwE
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xdtv/files/digest-xdtv-2.3.0 b/media-tv/xdtv/files/digest-xdtv-2.3.0
new file mode 100644
index 000000000000..c4b2d5be2ca3
--- /dev/null
+++ b/media-tv/xdtv/files/digest-xdtv-2.3.0
@@ -0,0 +1,31 @@
+MD5 b73d038ed88a457103c8774c64d5f620 libxdtv-i18n-ca-1.3.0.tar.gz 638256
+MD5 054af1345b2a731f2f28f43b4b9218fd libxdtv-i18n-de-1.3.0.tar.gz 633884
+MD5 154cc99aa8ce26fc98db85a852ef5e51 libxdtv-i18n-en-1.3.0.tar.gz 583704
+MD5 870ca47b1ba50c69a0948f574c6866aa libxdtv-i18n-es-1.3.0.tar.gz 636460
+MD5 74651cf544e88b7167c6c88550693f54 libxdtv-i18n-fr-1.3.0.tar.gz 642408
+MD5 d797af076746e0687b4ee6f531c0ffef libxdtv-i18n-gl-1.3.0.tar.gz 641434
+MD5 5d36abb0ae4fcb51930cb9252405988d libxdtv-i18n-it-1.3.0.tar.gz 638380
+MD5 6932f58dceb968933a8439db3d1c0f47 libxdtv-i18n-ja-1.3.0.tar.gz 621190
+MD5 194ce099fd708573a4cfb94d257c90a2 libxdtv-i18n-pl-1.3.0.tar.gz 643831
+MD5 b879caaf4df7f04391fb3f96b0434456 libxdtv-i18n-ru-1.3.0.tar.gz 639287
+MD5 097ed70dbf0ffa81ab86310bdcb890d0 libxdtv-theme-aqua-ca-1.3.0.tar.gz 352441
+MD5 ddc42e332f4b97474da9d279f298e2c7 libxdtv-theme-aqua-de-1.3.0.tar.gz 351421
+MD5 889fa91845d86ddf247a7ef2412c7f03 libxdtv-theme-aqua-en-1.3.0.tar.gz 353233
+MD5 46fd9ce9f9012b811ef6d0ff7d96d593 libxdtv-theme-aqua-es-1.3.0.tar.gz 353137
+MD5 8da90502892363ecd3cb0338a9186d06 libxdtv-theme-aqua-fr-1.3.0.tar.gz 354819
+MD5 75567ab74db5cf093c5dbd562227448b libxdtv-theme-aqua-gl-1.3.0.tar.gz 360310
+MD5 f1c233c43e735e182e668268b2cebe4f libxdtv-theme-aqua-it-1.3.0.tar.gz 352958
+MD5 449464fa7138b2fb3098cbe660009e12 libxdtv-theme-aqua-ja-1.3.0.tar.gz 332709
+MD5 317e89112f3b6630f100bd2e70a4a67e libxdtv-theme-aqua-pl-1.3.0.tar.gz 359057
+MD5 f883b6ea0ee3bf7158b80f4c7ede3098 libxdtv-theme-aqua-ru-1.3.0.tar.gz 353110
+MD5 31e7645f1594777870db1247cee304dd libxdtv-theme-carbone-ca-1.3.0.tar.gz 394819
+MD5 c3ef10cfda3f3dac61d0f131dbfa4deb libxdtv-theme-carbone-de-1.3.0.tar.gz 397029
+MD5 40ba15788c76d4165538cc78fbf1881d libxdtv-theme-carbone-en-1.3.0.tar.gz 393569
+MD5 0c130a2a6ded0387985e43e172523842 libxdtv-theme-carbone-es-1.3.0.tar.gz 397231
+MD5 072b5577ef71460dab527722583ef334 libxdtv-theme-carbone-fr-1.3.0.tar.gz 397603
+MD5 b50960e7bccdaba28e0e5653039a476e libxdtv-theme-carbone-gl-1.3.0.tar.gz 403660
+MD5 dd23097104b095d2db047ab9ddc77c96 libxdtv-theme-carbone-it-1.3.0.tar.gz 399396
+MD5 5346d714ffe442462b65acc2f738280e libxdtv-theme-carbone-ja-1.3.0.tar.gz 373453
+MD5 e56ec2f89767940326e2d82fc32c969f libxdtv-theme-carbone-pl-1.3.0.tar.gz 396722
+MD5 89aaf20a63b63e5d81c3998c8a0e2f15 libxdtv-theme-carbone-ru-1.3.0.tar.gz 394769
+MD5 4a78862d176cd592b48f15f0acc1bc40 xdtv-2.3.0.tar.gz 1087095
diff --git a/media-tv/xdtv/files/xdtv-2.3.0-setXid.patch b/media-tv/xdtv/files/xdtv-2.3.0-setXid.patch
new file mode 100644
index 000000000000..91403d90f80d
--- /dev/null
+++ b/media-tv/xdtv/files/xdtv-2.3.0-setXid.patch
@@ -0,0 +1,12 @@
+Index: xdtv-2.2.0/src/Makefile.am
+===================================================================
+--- xdtv-2.2.0.orig/src/Makefile.am
++++ xdtv-2.2.0/src/Makefile.am
+@@ -135,6 +135,7 @@ xdtv_LDADD = ../alevt/libalevt.a @X_LIBS
+ xdtv_LDFLAGS = -rdynamic
+ 
+ xdtv_v4l_conf_SOURCES = xdtv_v4l-conf.c
++xdtv_v4l_conf_LDFLAGS = $(BINDNOW_FLAGS)
+ xdtv_v4l_conf_LDADD = @X_LIBS@ -lX11 @LIBXEXT@ @LIBXXF86DGA@ @LIBXXF86VM@
+ 
+ xdtv_wizard_SOURCES = xdtv_wizard.c translation.c 
diff --git a/media-tv/xdtv/xdtv-2.3.0.ebuild b/media-tv/xdtv/xdtv-2.3.0.ebuild
new file mode 100644
index 000000000000..abd57c201f3e
--- /dev/null
+++ b/media-tv/xdtv/xdtv-2.3.0.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.3.0.ebuild,v 1.1 2006/01/28 00:02:50 flameeyes Exp $
+
+inherit font multilib autotools flag-o-matic
+
+IUSE="alsa jpeg encode ffmpeg xvid lirc xinerama neXt Xaw3d mmx zvbi aqua_theme
+carbone_theme xv debug dvb ogg png"
+
+DESCRIPTION="TV viewer with support for AVI recording and plugins"
+HOMEPAGE="http://xawdecode.sourceforge.net/"
+
+I18N_PV="1.3.0"
+THEMES_PV="1.3.0"
+
+SRC_URI="mirror://sourceforge/xawdecode/${P}.tar.gz"
+
+for lang in ca de en es fr gl it ja pl ru; do
+	SRC_URI="${SRC_URI}
+		linguas_${lang}? (
+			mirror://sourceforge/xawdecode/libxdtv-i18n-${lang}-${I18N_PV}.tar.gz
+			aqua_theme? ( mirror://sourceforge/xawdecode/libxdtv-theme-aqua-${lang}-${THEMES_PV}.tar.gz )
+			carbone_theme? ( mirror://sourceforge/xawdecode/libxdtv-theme-carbone-${lang}-${THEMES_PV}.tar.gz )
+		)"
+done
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="zvbi? ( >=media-libs/zvbi-0.2.4 )
+	neXt? ( x11-libs/neXtaw )
+	Xaw3d? ( !neXt? ( x11-libs/Xaw3d ) )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20051216 )
+	xvid? ( >=media-libs/xvid-1.0 )
+	encode? ( >=media-sound/lame-3.93 )
+	jpeg? ( media-libs/jpeg )
+	lirc? ( app-misc/lirc )
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	ogg? ( media-libs/libogg
+		media-libs/libtheora
+		media-libs/libvorbis )
+	png? ( media-libs/libpng )
+	|| ( ( x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-libs/libXxf86dga
+		x11-libs/libSM
+		x11-libs/libXaw
+		x11-libs/libXv )
+		virtual/x11 )
+	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )"
+
+DEPEND="${RDEPEND}
+	dvb? ( media-tv/linuxtv-dvb-headers )
+	|| ( ( x11-proto/videoproto
+		x11-proto/xproto
+		x11-proto/xextproto )
+		virtual/x11 )
+	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )"
+
+FONT_S="${S}/font"
+FONT_SUFFIX="pcf.gz"
+
+extension_iter() {
+	local my_a
+	for my_a in ${A} ; do
+		my_a=${my_a%%.tar.gz}
+		if [ -z ${my_a/libxdtv*/} ] ; then
+			eval ${1} ${my_a} || die "${1}(${my_a}) failed."
+		fi
+	done
+}
+
+extension_compile() {
+	einfo "Building ${1}"
+	cd ${WORKDIR}/${1}
+
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+extension_install() {
+	einfo "Installing ${1}"
+	cd ${WORKDIR}/${1} \
+		&& make DESTDIR=${D} LIBDIR="/usr/$(get_libdir)/${PN}" install
+}
+
+src_unpack() {
+	unpack ${A}
+	# Disable font installation
+	sed -i -e '/^install:/,/^$/s:^\t:#:p' ${S}/font/Makefile.in
+	# Disable /usr/share/xdtv/icons/* installation
+	sed -i -e '/^install-data-local:/,${\:share/xdtv/icons:d}' ${S}/Makefile.in
+
+	cd ${S}
+	epatch "${FILESDIR}/${P}-setXid.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	# Seems to break strict aliasing rules, better give it non-strict aliasing
+	append-flags -fno-strict-aliasing
+
+	# Makes the xaw widgets choice deterministic
+	local xawconf="--disable-xaw95 --disable-xawm"
+	if use neXt ; then
+		use Xaw3d && ewarn "Both \"neXt\" and \"Xaw3d\" found in USE. Will use neXtaw widgets."
+		xawconf="${xawconf} --enable-nextaw --disable-xaw3d"
+	elif use Xaw3d ; then
+		xawconf="${xawconf} --disable-nextaw --enable-xaw3d"
+	else
+		xawconf="${xawconf} --disable-nextaw --disable-xaw3d"
+		ewarn "If you want a better GUI toolkit, enable either \"neXt\" or \"Xaw3d\" USE flags."
+	fi
+
+	( use mmx || use amd64 ) && myconf="${myconf} --enable-mmx" || \
+		myconf="${myconf} --disable-mmx"
+
+	econf ${xawconf} \
+		$(use_enable alsa) \
+		$(use_enable jpeg) \
+		$(use_enable lirc) \
+		$(use_enable ffmpeg) \
+		$(use_enable xvid) \
+		$(use_enable xinerama) \
+		$(use_enable zvbi) \
+		$(use_enable xv xvideo) \
+		$(use_enable encode lame) \
+		$(use_enable !debug nodebug) \
+		$(use_enable dvb) \
+		$(use_enable ogg) \
+		$(use_enable png) \
+		--enable-pixmaps \
+		--disable-cpu-detection \
+		--disable-divx4linux \
+		${myconf} \
+		|| die "Configuration failed."
+
+	emake BINDNOW_FLAGS="$(bindnow-flags)" OPT="${CFLAGS}" PERF_FLAGS="${CFLAGS}" || die "Compilation failed."
+
+	# Build the extensions (i18n and theme libraries)
+	extension_iter extension_compile
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "Installation failed."
+
+	# .desktop file and default icon
+	domenu gentoo/xdtv.desktop
+	doicon ${S}/src/xdtv.xpm
+
+	# Install the icons in the hicolor theme
+	for dim in 48 32 16; do
+		insinto /usr/share/icons/hicolor/${dim}x${dim}/apps
+		newins ${S}/xdtv-${dim}.png xdtv.png
+	done
+
+	# Install the led-fixed font with font.eclass
+	gzip font/*.pcf
+	font_src_install
+
+	# Install documentation
+	dodoc ChangeLog AUTHORS FAQ* README.* TODO lisez-moi* \
+		xdtvrc.sample lircrc.*.sample
+	docinto alevt
+	dodoc alevt/README alevt/ReadmeGR alevt/CHANGELOG alevt/COPYRIGHT
+
+	# Install the extensions (i18n and theme libraries)
+	extension_iter extension_install
+}
+
+pkg_postinst() {
+	echo
+	einfo "Please note that this ebuild created a suid-binary:"
+	einfo "/usr/bin/xdtv_v4l-conf"
+	echo
+	einfo "The OSD font has moved. You probably should add"
+	einfo "this path to your X configuration:"
+	einfo "/usr/share/fonts/${PN}"
+	echo
+}