Added new theme (carbone) and bumped the versions of aqua theme and i18n support. Thanks to Sir Pingus <pingus_77@yahoo.fr> for the update.

(Portage version: 2.0.51.22-r2)

4 files changed, 249 insertions, 3 deletions

diff --git a/media-tv/xdtv/ChangeLog b/media-tv/xdtv/ChangeLog
index 425b04acfbc3..31d8cc16ecc9 100644
--- a/media-tv/xdtv/ChangeLog
+++ b/media-tv/xdtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/xdtv
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.6 2005/07/13 21:54:16 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.7 2005/07/25 09:52:37 flameeyes Exp $
+
+*xdtv-2.2.0-r1 (25 Jul 2005)
+
+  25 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> +xdtv-2.2.0-r1.ebuild:
+  Added new theme (carbone) and bumped the versions of aqua theme and i18n
+  support. Thanks to Sir Pingus <pingus_77@yahoo.fr> for the update.
 
   13 Jul 2005; Matthias Schwarzott <zzam@gentoo.org> xdtv-2.2.0.ebuild:
   Changed dependency on dvb according to Bug #98672
diff --git a/media-tv/xdtv/Manifest b/media-tv/xdtv/Manifest
index 440d5c122fae..d9b0cf3c1552 100644
--- a/media-tv/xdtv/Manifest
+++ b/media-tv/xdtv/Manifest
@@ -1,4 +1,6 @@
-MD5 8e8601ced71a197c7720ae4bea851d6c xdtv-2.2.0.ebuild 6038
-MD5 64c7628edb710582638ca646ef0d2e57 ChangeLog 1076
 MD5 0dfc4d0a0cad3dc6b761593f69ac917b metadata.xml 252
+MD5 64c7628edb710582638ca646ef0d2e57 ChangeLog 1076
+MD5 8e8601ced71a197c7720ae4bea851d6c xdtv-2.2.0.ebuild 6038
+MD5 4bf9d39217b6cf979341a945db070fcb xdtv-2.2.0-r1.ebuild 6773
 MD5 1a76927ad3fc30c72aa7648bfd77f065 files/digest-xdtv-2.2.0 1252
+MD5 ad3fc730b848c1a6a0cfc126861e1f6b files/digest-xdtv-2.2.0-r1 1777
diff --git a/media-tv/xdtv/files/digest-xdtv-2.2.0-r1 b/media-tv/xdtv/files/digest-xdtv-2.2.0-r1
new file mode 100644
index 000000000000..7b897c022289
--- /dev/null
+++ b/media-tv/xdtv/files/digest-xdtv-2.2.0-r1
@@ -0,0 +1,23 @@
+MD5 5f8069ae7a64e0907c59de26290d9fe7 xdtv-2.2.0.tar.gz 905162
+MD5 a12af6bdb5eef46d10935f635d4e0dda xdtv-2.2.0-gcc4-amd64.patch.tar.gz 6027
+MD5 57f6c6d31731fd1e2aa381d14a31e828 libxdtv-i18n-ca-1.2.0.tar.gz 561158
+MD5 6de4421d9b3a93968473eb884bec0b3d libxdtv-theme-aqua-ca-1.2.0.tar.gz 324890
+MD5 608aebb9454bba0cf5c52a2a1f06e1f0 libxdtv-theme-carbone-ca-1.2.0.tar.gz 358108
+MD5 98a070202c0f4fdd24f585eccccabc54 libxdtv-i18n-en-1.2.0.tar.gz 517747
+MD5 1c95bbec7051299048b4f3a7be1d2c54 libxdtv-theme-aqua-en-1.2.0.tar.gz 325032
+MD5 0337867e944d5418fba4b2555a019055 libxdtv-theme-carbone-en-1.2.0.tar.gz 355666
+MD5 4dc39e28bc41fe07dc017de32ac18596 libxdtv-i18n-es-1.2.0.tar.gz 561363
+MD5 7dcf8d6157ba7c8eac2be16ae9e79621 libxdtv-theme-aqua-es-1.2.0.tar.gz 325455
+MD5 8779e6fbc2c11a67a78e4e0cab090284 libxdtv-theme-carbone-es-1.2.0.tar.gz 358858
+MD5 4b2083a31fb241961da12625b056130f libxdtv-i18n-fr-1.2.0.tar.gz 565273
+MD5 d7f49d6a0fb4e474d88eb98141998c12 libxdtv-theme-aqua-fr-1.2.0.tar.gz 325839
+MD5 ea212ac3cb4d2737b80b032081ed9797 libxdtv-theme-carbone-fr-1.2.0.tar.gz 360314
+MD5 3e391b66f04c194faa2d5c83bb89e3f5 libxdtv-i18n-de-1.2.0.tar.gz 559203
+MD5 8d8d762b3323b70d206a158803cf6cb0 libxdtv-theme-aqua-de-1.2.0.tar.gz 322433
+MD5 46d0f7e93994e3fffc7208cc94c2ada2 libxdtv-theme-carbone-de-1.2.0.tar.gz 357587
+MD5 0cc803147a8b86381845b00d7e1f8682 libxdtv-i18n-ja-1.2.0.tar.gz 544804
+MD5 48754d81b1234363206dac53ae8d6d19 libxdtv-theme-aqua-ja-1.2.0.tar.gz 306498
+MD5 42c7e3a92d6625e18e9a8cdcfa30b317 libxdtv-theme-carbone-ja-1.2.0.tar.gz 341365
+MD5 d2ff1ec9938edbe16229881291e5fecd libxdtv-i18n-it-1.2.0.tar.gz 563947
+MD5 12f9508b3bc9f9a1b1e6799da574ab25 libxdtv-theme-aqua-it-1.2.0.tar.gz 324152
+MD5 9fffe9c73032e43d42c3e8c5ea31d55c libxdtv-theme-carbone-it-1.2.0.tar.gz 361097
diff --git a/media-tv/xdtv/xdtv-2.2.0-r1.ebuild b/media-tv/xdtv/xdtv-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..370c4bf5b220
--- /dev/null
+++ b/media-tv/xdtv/xdtv-2.2.0-r1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.2.0-r1.ebuild,v 1.1 2005/07/25 09:52:37 flameeyes Exp $
+
+inherit font multilib
+
+IUSE="alsa jpeg encode ffmpeg xvid lirc xinerama divx4linux
+	neXt Xaw3d mmx zvbi aqua_theme carbone_theme xv debug dvb"
+
+DESCRIPTION="TV viewer with support for AVI recording and plugins"
+HOMEPAGE="http://xawdecode.sourceforge.net/"
+
+I18N_PV="1.2.0"
+THEMES_PV="1.2.0"
+
+I18N_EN="libxdtv-i18n-en-${I18N_PV}"
+I18N_FR="libxdtv-i18n-fr-${I18N_PV}"
+I18N_CA="libxdtv-i18n-ca-${I18N_PV}"
+I18N_ES="libxdtv-i18n-es-${I18N_PV}"
+I18N_DE="libxdtv-i18n-de-${I18N_PV}"
+I18N_JA="libxdtv-i18n-ja-${I18N_PV}"
+I18N_IT="libxdtv-i18n-it-${I18N_PV}"
+THEME_AQUA_EN="libxdtv-theme-aqua-en-${THEMES_PV}"
+THEME_AQUA_FR="libxdtv-theme-aqua-fr-${THEMES_PV}"
+THEME_AQUA_CA="libxdtv-theme-aqua-ca-${THEMES_PV}"
+THEME_AQUA_ES="libxdtv-theme-aqua-es-${THEMES_PV}"
+THEME_AQUA_DE="libxdtv-theme-aqua-de-${THEMES_PV}"
+THEME_AQUA_JA="libxdtv-theme-aqua-ja-${THEMES_PV}"
+THEME_AQUA_IT="libxdtv-theme-aqua-it-${THEMES_PV}"
+THEME_CARBONE_EN="libxdtv-theme-carbone-en-${THEMES_PV}"
+THEME_CARBONE_FR="libxdtv-theme-carbone-fr-${THEMES_PV}"
+THEME_CARBONE_CA="libxdtv-theme-carbone-ca-${THEMES_PV}"
+THEME_CARBONE_ES="libxdtv-theme-carbone-es-${THEMES_PV}"
+THEME_CARBONE_DE="libxdtv-theme-carbone-de-${THEMES_PV}"
+THEME_CARBONE_JA="libxdtv-theme-carbone-ja-${THEMES_PV}"
+THEME_CARBONE_IT="libxdtv-theme-carbone-it-${THEMES_PV}"
+
+DOWNLOADS_URL="mirror://sourceforge/xawdecode"
+SRC_URI="${DOWNLOADS_URL}/${P}.tar.gz
+	${DOWNLOADS_URL}/${P}-gcc4-amd64.patch.tar.gz
+
+	linguas_ca? (
+		${DOWNLOADS_URL}/${I18N_CA}.tar.gz
+		aqua_theme? ( ${DOWNLOADS_URL}/${THEME_AQUA_CA}.tar.gz )
+		carbone_theme? ( ${DOWNLOADS_URL}/${THEME_CARBONE_CA}.tar.gz ) )
+	linguas_en? (
+		${DOWNLOADS_URL}/${I18N_EN}.tar.gz
+		aqua_theme? ( ${DOWNLOADS_URL}/${THEME_AQUA_EN}.tar.gz )
+		carbone_theme? ( ${DOWNLOADS_URL}/${THEME_CARBONE_EN}.tar.gz ) )
+	linguas_es? (
+		${DOWNLOADS_URL}/${I18N_ES}.tar.gz
+		aqua_theme? ( ${DOWNLOADS_URL}/${THEME_AQUA_ES}.tar.gz )
+		carbone_theme? ( ${DOWNLOADS_URL}/${THEME_CARBONE_ES}.tar.gz ) )
+	linguas_fr? (
+		${DOWNLOADS_URL}/${I18N_FR}.tar.gz
+		aqua_theme? ( ${DOWNLOADS_URL}/${THEME_AQUA_FR}.tar.gz )
+		carbone_theme? ( ${DOWNLOADS_URL}/${THEME_CARBONE_FR}.tar.gz ) )
+	linguas_de? (
+		${DOWNLOADS_URL}/${I18N_DE}.tar.gz
+		aqua_theme? ( ${DOWNLOADS_URL}/${THEME_AQUA_DE}.tar.gz )
+		carbone_theme? ( ${DOWNLOADS_URL}/${THEME_CARBONE_DE}.tar.gz ) )
+	linguas_ja? (
+		${DOWNLOADS_URL}/${I18N_JA}.tar.gz
+		aqua_theme? ( ${DOWNLOADS_URL}/${THEME_AQUA_JA}.tar.gz )
+		carbone_theme? ( ${DOWNLOADS_URL}/${THEME_CARBONE_JA}.tar.gz ) )
+	linguas_it? (
+		${DOWNLOADS_URL}/${I18N_IT}.tar.gz
+		aqua_theme? ( ${DOWNLOADS_URL}/${THEME_AQUA_IT}.tar.gz )
+		carbone_theme? ( ${DOWNLOADS_URL}/${THEME_CARBONE_IT}.tar.gz ) )
+	!linguas_ca? ( !linguas_es? ( !linguas_fr? ( !linguas_de? ( !linguas_ja? ( !linguas_it? (
+		${DOWNLOADS_URL}/${I18N_EN}.tar.gz
+		aqua_theme? ( ${DOWNLOADS_URL}/${THEME_AQUA_EN}.tar.gz )
+		carbone_theme? ( ${DOWNLOADS_URL}/${THEME_CARBONE_EN}.tar.gz ) ) ) ) ) ) )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="virtual/x11
+	zvbi? ( >=media-libs/zvbi-0.2.4 )
+	neXt? ( x11-libs/neXtaw )
+	Xaw3d? ( !neXt? ( x11-libs/Xaw3d ) )
+	divx4linux? ( >=media-libs/divx4linux-20030428 )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.7 )
+	xvid? ( =media-libs/xvid-1* )
+	encode? ( >=media-sound/lame-3.93 )
+	jpeg? ( media-libs/jpeg )
+	lirc? ( app-misc/lirc )
+	alsa? ( >=media-libs/alsa-lib-0.9 )"
+
+DEPEND="${RDEPEND}
+	dvb? ( ||(
+		>=sys-kernel/linux-headers-2.6.11-r2
+		media-tv/linuxtv-dvb
+	) )"
+
+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 ${WORKDIR}/${P}-gcc4-amd64.patch
+
+	autoreconf || die "autoreconf failed"
+	libtoolize --copy --force || die "libtoolize failed"
+}
+
+src_compile() {
+	# 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 divx4linux) \
+		$(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) \
+		--enable-pixmaps \
+		--disable-cpu-detection \
+		${myconf} \
+		|| die "Configuration failed."
+
+	emake 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
+	insinto /usr/share/icons
+	doins ${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/led-fixed.pcf
+	font_src_install
+
+	# Install documentation
+	dodoc ChangeLog AUTHORS INSTALL 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
+}