summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2007-07-04 08:36:08 +0000
committerAlexis Ballier <aballier@gentoo.org>2007-07-04 08:36:08 +0000
commit2aa964ac4f6f0b2fc9d7b11fd458891bf7fc87f2 (patch)
tree1ada1002e37dc43a72075026b1b2625a988d3b80 /media-tv/xdtv
parentBump to 0.9.4 (bug #183212) and drop all ebuilds <0.9.3 (diff)
downloadgentoo-2-2aa964ac4f6f0b2fc9d7b11fd458891bf7fc87f2.tar.gz
gentoo-2-2aa964ac4f6f0b2fc9d7b11fd458891bf7fc87f2.tar.bz2
gentoo-2-2aa964ac4f6f0b2fc9d7b11fd458891bf7fc87f2.zip
remove unused version
(Portage version: 2.1.3_rc6)
Diffstat (limited to 'media-tv/xdtv')
-rw-r--r--media-tv/xdtv/ChangeLog8
-rw-r--r--media-tv/xdtv/files/digest-xdtv-2.3.393
-rw-r--r--media-tv/xdtv/files/libxdtv-i18n-all-1.3.0-ldflags.patch19
-rw-r--r--media-tv/xdtv/files/xdtv-2.3.0-setXid.patch12
-rw-r--r--media-tv/xdtv/files/xdtv-2.3.2-parallel-install.patch13
-rw-r--r--media-tv/xdtv/files/xdtv-2.3.3-external-ffmpeg.patch63
-rw-r--r--media-tv/xdtv/xdtv-2.3.3.ebuild216
7 files changed, 7 insertions, 417 deletions
diff --git a/media-tv/xdtv/ChangeLog b/media-tv/xdtv/ChangeLog
index d688e43fc64b..579fdd12a776 100644
--- a/media-tv/xdtv/ChangeLog
+++ b/media-tv/xdtv/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-tv/xdtv
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.49 2007/07/04 08:27:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.50 2007/07/04 08:36:08 aballier Exp $
+
+ 04 Jul 2007; Alexis Ballier <aballier@gentoo.org>
+ -files/libxdtv-i18n-all-1.3.0-ldflags.patch,
+ -files/xdtv-2.3.0-setXid.patch, -files/xdtv-2.3.2-parallel-install.patch,
+ -files/xdtv-2.3.3-external-ffmpeg.patch, -xdtv-2.3.3.ebuild:
+ remove unused version
04 Jul 2007; Alexis Ballier <aballier@gentoo.org>
+files/xdtv-2.4.0-ffmpeg.patch, xdtv-2.4.0.ebuild:
diff --git a/media-tv/xdtv/files/digest-xdtv-2.3.3 b/media-tv/xdtv/files/digest-xdtv-2.3.3
deleted file mode 100644
index 9814e19067b6..000000000000
--- a/media-tv/xdtv/files/digest-xdtv-2.3.3
+++ /dev/null
@@ -1,93 +0,0 @@
-MD5 b73d038ed88a457103c8774c64d5f620 libxdtv-i18n-ca-1.3.0.tar.gz 638256
-RMD160 e9e0de1a1c37bee4b7cf001fc42976599df1527e libxdtv-i18n-ca-1.3.0.tar.gz 638256
-SHA256 6dc2cc65128e9e5d11a536f0b86a57cd193fbc12cbf2817a28e53a2049ed198a libxdtv-i18n-ca-1.3.0.tar.gz 638256
-MD5 054af1345b2a731f2f28f43b4b9218fd libxdtv-i18n-de-1.3.0.tar.gz 633884
-RMD160 5b6d094253bb57fa8c8eb6f677169d74d6af8bcd libxdtv-i18n-de-1.3.0.tar.gz 633884
-SHA256 b6abeef649d3b48a40b43d492155ff1e6cbfbb494574b612a834bf14203a05d4 libxdtv-i18n-de-1.3.0.tar.gz 633884
-MD5 154cc99aa8ce26fc98db85a852ef5e51 libxdtv-i18n-en-1.3.0.tar.gz 583704
-RMD160 3ecc63677a9019a0eb7b5ad08829b4f217cbd863 libxdtv-i18n-en-1.3.0.tar.gz 583704
-SHA256 271243cd258778aa44affbcfc6c9bde71d16d8c68288ffa47ce476752c14e1a3 libxdtv-i18n-en-1.3.0.tar.gz 583704
-MD5 870ca47b1ba50c69a0948f574c6866aa libxdtv-i18n-es-1.3.0.tar.gz 636460
-RMD160 6244a3f21a54de3abb2b5de4a28087c6c696ae32 libxdtv-i18n-es-1.3.0.tar.gz 636460
-SHA256 582b2599f1abeae6285545355c032d86e2d2ea57c2dd49b7f52662655f5f8a68 libxdtv-i18n-es-1.3.0.tar.gz 636460
-MD5 74651cf544e88b7167c6c88550693f54 libxdtv-i18n-fr-1.3.0.tar.gz 642408
-RMD160 0ae0e3c4e2395f02af49eb5b97b20f7d643b50a4 libxdtv-i18n-fr-1.3.0.tar.gz 642408
-SHA256 dc41cebb81e8a42b9fec11b9943eb25c843885d6fd39b94660f1d530d3ac86a8 libxdtv-i18n-fr-1.3.0.tar.gz 642408
-MD5 d797af076746e0687b4ee6f531c0ffef libxdtv-i18n-gl-1.3.0.tar.gz 641434
-RMD160 dfe5902c953376087642a6c22c713e916da0cb81 libxdtv-i18n-gl-1.3.0.tar.gz 641434
-SHA256 975fbe7f4ea9185b63f113662befaee720636463d7a0aa07493f84586dd83966 libxdtv-i18n-gl-1.3.0.tar.gz 641434
-MD5 5d36abb0ae4fcb51930cb9252405988d libxdtv-i18n-it-1.3.0.tar.gz 638380
-RMD160 675207aeac91080b4030fa028d8d56d40ad87292 libxdtv-i18n-it-1.3.0.tar.gz 638380
-SHA256 e640ef4bcdfffc55ce7442d120a8bb03bb6b719677cb8ec8c081cff9e7f6d1a3 libxdtv-i18n-it-1.3.0.tar.gz 638380
-MD5 6932f58dceb968933a8439db3d1c0f47 libxdtv-i18n-ja-1.3.0.tar.gz 621190
-RMD160 d2b24f5799ba4fcc5568d679b267c87b19a57e0d libxdtv-i18n-ja-1.3.0.tar.gz 621190
-SHA256 9b54882b0548de6f668256b5a1d8bbc19dcc5dced978c5f713a0f451ac5f71cd libxdtv-i18n-ja-1.3.0.tar.gz 621190
-MD5 194ce099fd708573a4cfb94d257c90a2 libxdtv-i18n-pl-1.3.0.tar.gz 643831
-RMD160 1cd6c507d4d50ac38d435f98b7a5beb88f1dfa17 libxdtv-i18n-pl-1.3.0.tar.gz 643831
-SHA256 d2f8b26e3c15a964da1715bad060c02f49045f864b554ccc41d08e3218f25000 libxdtv-i18n-pl-1.3.0.tar.gz 643831
-MD5 b879caaf4df7f04391fb3f96b0434456 libxdtv-i18n-ru-1.3.0.tar.gz 639287
-RMD160 ca1d95c2357e7682c403ad266384ef8d04316ec6 libxdtv-i18n-ru-1.3.0.tar.gz 639287
-SHA256 8cd53aa6ac18948223d6cbcfcd5d687cd644243678b58f4f36e62720cf04b340 libxdtv-i18n-ru-1.3.0.tar.gz 639287
-MD5 097ed70dbf0ffa81ab86310bdcb890d0 libxdtv-theme-aqua-ca-1.3.0.tar.gz 352441
-RMD160 ccded0eb1d1986dd54295126e43a022a84c498ab libxdtv-theme-aqua-ca-1.3.0.tar.gz 352441
-SHA256 248aede4da383f1dd9c09086f129e54bb49d3fbd3fd5fbb0c453e8fbe34e183b libxdtv-theme-aqua-ca-1.3.0.tar.gz 352441
-MD5 ddc42e332f4b97474da9d279f298e2c7 libxdtv-theme-aqua-de-1.3.0.tar.gz 351421
-RMD160 fc3a997942ad3ef02c0365f52f1113b7b820d28b libxdtv-theme-aqua-de-1.3.0.tar.gz 351421
-SHA256 ae61a878fad4271bc99740fca36eb2ff8fb2673cda4730be5eee3da57178b8b8 libxdtv-theme-aqua-de-1.3.0.tar.gz 351421
-MD5 889fa91845d86ddf247a7ef2412c7f03 libxdtv-theme-aqua-en-1.3.0.tar.gz 353233
-RMD160 bb351bdfdc9d5a5be42c10a7c7b3a48d89e22dc5 libxdtv-theme-aqua-en-1.3.0.tar.gz 353233
-SHA256 b8098b67d5a76933607540920f1cb1c0f92a2ab97c6eaa0cb29c5767d3e775d4 libxdtv-theme-aqua-en-1.3.0.tar.gz 353233
-MD5 46fd9ce9f9012b811ef6d0ff7d96d593 libxdtv-theme-aqua-es-1.3.0.tar.gz 353137
-RMD160 222915463e1a1408d2b9abe81617c14c4b34bea7 libxdtv-theme-aqua-es-1.3.0.tar.gz 353137
-SHA256 a2e26c47ce562976e3ec285d704604c0d385bb2c3a2d4f90f1020f7b662567b6 libxdtv-theme-aqua-es-1.3.0.tar.gz 353137
-MD5 8da90502892363ecd3cb0338a9186d06 libxdtv-theme-aqua-fr-1.3.0.tar.gz 354819
-RMD160 a98e7b84e8b18f12cd3973449d6b6d43d88ec1cc libxdtv-theme-aqua-fr-1.3.0.tar.gz 354819
-SHA256 925a82f5dced5b881b240802d1d3e07c0bad40b8f5999aa1a7bdaf2bce0a8876 libxdtv-theme-aqua-fr-1.3.0.tar.gz 354819
-MD5 75567ab74db5cf093c5dbd562227448b libxdtv-theme-aqua-gl-1.3.0.tar.gz 360310
-RMD160 bef7f53f910e3c35547262c533c781ec66008791 libxdtv-theme-aqua-gl-1.3.0.tar.gz 360310
-SHA256 3bc3b1991330f2cebc8cf02c852acf3611ba3cb0015a812aa52c75b82fd5de68 libxdtv-theme-aqua-gl-1.3.0.tar.gz 360310
-MD5 f1c233c43e735e182e668268b2cebe4f libxdtv-theme-aqua-it-1.3.0.tar.gz 352958
-RMD160 0497616e00b7a43916045af44fb9aab76f42aa4c libxdtv-theme-aqua-it-1.3.0.tar.gz 352958
-SHA256 f94157eb84a01325d5e42c29553d64bb8c9a95c223d4e1f350dfe9948d8d3ca0 libxdtv-theme-aqua-it-1.3.0.tar.gz 352958
-MD5 449464fa7138b2fb3098cbe660009e12 libxdtv-theme-aqua-ja-1.3.0.tar.gz 332709
-RMD160 72a2958d12348182e11672bb7801c8e76c5329a9 libxdtv-theme-aqua-ja-1.3.0.tar.gz 332709
-SHA256 92f7aaef28554a0f0c15f68e89c3a7d3c673cd0361b2bcfd36911b2e320a9af0 libxdtv-theme-aqua-ja-1.3.0.tar.gz 332709
-MD5 317e89112f3b6630f100bd2e70a4a67e libxdtv-theme-aqua-pl-1.3.0.tar.gz 359057
-RMD160 ac0664da9cdefdd5af70583eb2223c5668611f4f libxdtv-theme-aqua-pl-1.3.0.tar.gz 359057
-SHA256 3b1fdba8e0abc3b695f23f74825c829db55f7843ac1cfc7d2c15ecc52b7af6de libxdtv-theme-aqua-pl-1.3.0.tar.gz 359057
-MD5 f883b6ea0ee3bf7158b80f4c7ede3098 libxdtv-theme-aqua-ru-1.3.0.tar.gz 353110
-RMD160 e0a1455a56bac3fe940e9a1e39301002a7b1d49b libxdtv-theme-aqua-ru-1.3.0.tar.gz 353110
-SHA256 ebac73c26e3bd4bcb1b399c13145e401367f3fe4e2283cf9c736ee33e368b40f libxdtv-theme-aqua-ru-1.3.0.tar.gz 353110
-MD5 31e7645f1594777870db1247cee304dd libxdtv-theme-carbone-ca-1.3.0.tar.gz 394819
-RMD160 a7502f6b82924e4d4c5fcc892920fe902cda68e5 libxdtv-theme-carbone-ca-1.3.0.tar.gz 394819
-SHA256 4d857a1f37deb92b4c11a1fde1796413dc195c9520565712fe738552599d7718 libxdtv-theme-carbone-ca-1.3.0.tar.gz 394819
-MD5 c3ef10cfda3f3dac61d0f131dbfa4deb libxdtv-theme-carbone-de-1.3.0.tar.gz 397029
-RMD160 9d3e44cf07c8bc3c43dcb3251d8b9f1f2721c27f libxdtv-theme-carbone-de-1.3.0.tar.gz 397029
-SHA256 013fb39e0e1ffc04ac6dd90df0e093ff4f7fe98b28ed4bbf1a25cedd57504f4f libxdtv-theme-carbone-de-1.3.0.tar.gz 397029
-MD5 40ba15788c76d4165538cc78fbf1881d libxdtv-theme-carbone-en-1.3.0.tar.gz 393569
-RMD160 668d897bd93445c2b08179d814a5f40cd5f410c7 libxdtv-theme-carbone-en-1.3.0.tar.gz 393569
-SHA256 64df9e88fe751db0d5ddb5e97389bc1d982d39766e97758b67470dd5d3b54fc5 libxdtv-theme-carbone-en-1.3.0.tar.gz 393569
-MD5 0c130a2a6ded0387985e43e172523842 libxdtv-theme-carbone-es-1.3.0.tar.gz 397231
-RMD160 07c56713733013afd2a30f2deb8dfd582c387b47 libxdtv-theme-carbone-es-1.3.0.tar.gz 397231
-SHA256 17d27aaee357aeed29386f34cb47cad505ef61270f4c69d5133903072bbcf9fb libxdtv-theme-carbone-es-1.3.0.tar.gz 397231
-MD5 072b5577ef71460dab527722583ef334 libxdtv-theme-carbone-fr-1.3.0.tar.gz 397603
-RMD160 a126e4b66ec16426aff0b1b3a47df5d0397b438f libxdtv-theme-carbone-fr-1.3.0.tar.gz 397603
-SHA256 f6068987364594ab5a368208130e42f26e0f10f42d7e7cdbd5f47be2906feffd libxdtv-theme-carbone-fr-1.3.0.tar.gz 397603
-MD5 b50960e7bccdaba28e0e5653039a476e libxdtv-theme-carbone-gl-1.3.0.tar.gz 403660
-RMD160 00d60ff24c3dfcefcc9450c24a5eb41f9c2dd3a7 libxdtv-theme-carbone-gl-1.3.0.tar.gz 403660
-SHA256 c24ee64d5808d96e9fa17d0742cd02999086313c51e3ac6e55cc19bed1f3000f libxdtv-theme-carbone-gl-1.3.0.tar.gz 403660
-MD5 dd23097104b095d2db047ab9ddc77c96 libxdtv-theme-carbone-it-1.3.0.tar.gz 399396
-RMD160 0b6bed802998f26b5d09ece798c32edcf0ed174a libxdtv-theme-carbone-it-1.3.0.tar.gz 399396
-SHA256 89cb2f8f1ab29799d6dd8a556af26db882d8aa25ee6548059aedd0cd80716f56 libxdtv-theme-carbone-it-1.3.0.tar.gz 399396
-MD5 5346d714ffe442462b65acc2f738280e libxdtv-theme-carbone-ja-1.3.0.tar.gz 373453
-RMD160 1596eaaad3db174974e99780deb32071edfc6af2 libxdtv-theme-carbone-ja-1.3.0.tar.gz 373453
-SHA256 de2246f9653438ccb5ebef85edf97fb179cb1f0b211a969722b0145307149499 libxdtv-theme-carbone-ja-1.3.0.tar.gz 373453
-MD5 e56ec2f89767940326e2d82fc32c969f libxdtv-theme-carbone-pl-1.3.0.tar.gz 396722
-RMD160 3821660aebd489abf2830fff35ac0c8ec3aa3f52 libxdtv-theme-carbone-pl-1.3.0.tar.gz 396722
-SHA256 d9737a45242b384e557ea56713b14d00c722c23d04aafe68ac9c863494efff9b libxdtv-theme-carbone-pl-1.3.0.tar.gz 396722
-MD5 89aaf20a63b63e5d81c3998c8a0e2f15 libxdtv-theme-carbone-ru-1.3.0.tar.gz 394769
-RMD160 f9de71a685296cf00339d9193b382597f4e449bd libxdtv-theme-carbone-ru-1.3.0.tar.gz 394769
-SHA256 6481b50f0a3ea862c152e8000cb281cfb0269331a6d5a2a0fee89e75e0e5282e libxdtv-theme-carbone-ru-1.3.0.tar.gz 394769
-MD5 72528d2205ac5e22ae766283a993225c xdtv-2.3.3.tar.gz 2874010
-RMD160 839627fdf614f2bf18a8c6afde31a418db5a975f xdtv-2.3.3.tar.gz 2874010
-SHA256 4819afdb4a706adb570b140574e24432a9da168c821133abd246f821ce09f0a2 xdtv-2.3.3.tar.gz 2874010
diff --git a/media-tv/xdtv/files/libxdtv-i18n-all-1.3.0-ldflags.patch b/media-tv/xdtv/files/libxdtv-i18n-all-1.3.0-ldflags.patch
deleted file mode 100644
index ee3dcf1c4f79..000000000000
--- a/media-tv/xdtv/files/libxdtv-i18n-all-1.3.0-ldflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: libxdtv-i18n-en-1.3.0/src/Makefile.in
-===================================================================
---- libxdtv-i18n-en-1.3.0.orig/src/Makefile.in
-+++ libxdtv-i18n-en-1.3.0/src/Makefile.in
-@@ -2,13 +2,9 @@ LIBDIR=$(ROOT)/@prefix@/lib/xdtv/
-
- VERSION=@LIB_VERSION@
- NAME=@PACKAGE@
--PIC=@PIC@
--
--GCC=gcc
--CFLAGS=-Wall -shared -O4 @PIC@
-
- all:
-- $(GCC) $(CFLAGS) lib-pixmaps.c -o $(NAME).so
-+ $(CC) -shared @PIC@ $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(NAME).so lib-pixmaps.c -o $(NAME).so
-
- install:
- mkdir -p $(R)$(DESTDIR)$(LIBDIR)
diff --git a/media-tv/xdtv/files/xdtv-2.3.0-setXid.patch b/media-tv/xdtv/files/xdtv-2.3.0-setXid.patch
deleted file mode 100644
index 91403d90f80d..000000000000
--- a/media-tv/xdtv/files/xdtv-2.3.0-setXid.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/files/xdtv-2.3.2-parallel-install.patch b/media-tv/xdtv/files/xdtv-2.3.2-parallel-install.patch
deleted file mode 100644
index 00f9332d424d..000000000000
--- a/media-tv/xdtv/files/xdtv-2.3.2-parallel-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xdtv-2.3.2/src/Makefile.am
-===================================================================
---- xdtv-2.3.2.orig/src/Makefile.am
-+++ xdtv-2.3.2/src/Makefile.am
-@@ -149,7 +149,7 @@ xdtv_v4l_conf_LDADD = @X_LIBS@ -lX11 @LI
- xdtv_wizard_SOURCES = xdtv_wizard.c translation.c
- xdtv_wizard_LDADD = @X_LIBS@ @LIBXAW@ @LIBXMU@ @LIBXT@ @LIBXPM@ @LIBXEXT@ -lX11
-
--install-exec-local:
-+install-exec-local: install-binPROGRAMS
- chmod u+s $(DESTDIR)$(prefix)/bin/xdtv_v4l-conf
-
- xdtv_scantv_LDADD = @LIBZVBI@ @LIBM@ @LIBPTHREAD@
diff --git a/media-tv/xdtv/files/xdtv-2.3.3-external-ffmpeg.patch b/media-tv/xdtv/files/xdtv-2.3.3-external-ffmpeg.patch
deleted file mode 100644
index c54561b1d9c9..000000000000
--- a/media-tv/xdtv/files/xdtv-2.3.3-external-ffmpeg.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- xdtv-2.3.3/configure.in.old 2006-10-21 20:58:44.000000000 +0200
-+++ xdtv-2.3.3/configure.in 2006-10-21 20:59:53.000000000 +0200
-@@ -151,6 +151,7 @@
- AC_ARG_ENABLE(smallfont,
- [ --enable-smallfont enables AleVT Small Font
- --disable-smallfont disables AleVT Small Font (default)])
-+AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [use external ffmpeg library]))
-
- dnl ---------------------------------------------------------------------
- dnl Checks for programs.
-@@ -985,15 +986,20 @@
- LIBDL="",)
- AC_SUBST(LIBDL)
-
--dnl --------------------------------------------------
--dnl Checks for ffmpeg inside distribution
--if test "$enable_ffmpeg" != "no"; then
-- AC_MSG_CHECKING(for ffmpeg inside distribution)
-- if test -f libavcodec/allcodecs.c; then
-+ dnl --------------------------------------------------
-+ dnl Checks for ffmpeg inside distribution
-+ if test "$enable_ffmpeg" != "no"; then
-+ if test "x$with_external_ffmpeg" = "xyes"; then
-+ PKG_CHECK_MODULES([FFMPEG], [libavformat libavutil libpostproc libavcodec])
- enable_ffmpeg=yes
- else
-- enable_ffmpeg=no
-- fi
-+ AC_MSG_CHECKING(for ffmpeg inside distribution)
-+ if test -f libavcodec/allcodecs.c; then
-+ enable_ffmpeg=yes
-+ else
-+ enable_ffmpeg=no
-+ fi
-+ fi
- AC_MSG_RESULT($enable_ffmpeg)
- if test "$enable_ffmpeg" = "no"; then
- AC_MSG_WARN(*** xdtv compiled WITHOUT ffmpeg many capabilities are disabled !!)
-@@ -1413,11 +1419,19 @@
- cp -f configure.make config.mak.in
-
- dnl ---------xdtv flag--------------------------------------------
-- AC_DEFINE(HAVE_FFMPEG,1,FFMPEG is inside XdTV now!)
-- AC_DEFINE(HAVE_FFMPEG_AC3,1,FFMPEG is inside XdTV now!)
-- FFMPEGFOLDER="libavutil libpostproc libavcodec libavformat"
-- FFMPEGLINK="../libavformat/libavformat.a ../libavutil/libavutil.a ../libpostproc/libpostproc.a ../libavcodec/libavcodec.a"
-- FFMPEGINC="-I../libavutil -I../libpostproc -I../libavformat -I../libavcodec"
-+ if test "x$with_external_ffmpeg" = "xyes"; then
-+ AC_DEFINE(HAVE_FFMPEG,1,FFMPEG is external)
-+ AC_DEFINE(HAVE_FFMPEG_AC3,1,FFMPEG is external)
-+ FFMPEGFOLDER=""
-+ FFMPEGINC=$FFMPEG_CFLAGS
-+ FFMPEGLINK=$FFMPEG_LIBS
-+ else
-+ AC_DEFINE(HAVE_FFMPEG,1,FFMPEG is inside XdTV now!)
-+ AC_DEFINE(HAVE_FFMPEG_AC3,1,FFMPEG is inside XdTV now!)
-+ FFMPEGFOLDER="libavutil libpostproc libavcodec libavformat"
-+ FFMPEGLINK="../libavformat/libavformat.a ../libavutil/libavutil.a ../libpostproc/libpostproc.a ../libavcodec/libavcodec.a"
-+ FFMPEGINC="-I../libavutil -I../libpostproc -I../libavformat -I../libavcodec"
-+ fi
- AC_SUBST(FFMPEGLINK)
- AC_SUBST(FFMPEGINC)
- AC_SUBST(FFMPEGFOLDER)
diff --git a/media-tv/xdtv/xdtv-2.3.3.ebuild b/media-tv/xdtv/xdtv-2.3.3.ebuild
deleted file mode 100644
index 15ecc2f20e91..000000000000
--- a/media-tv/xdtv/xdtv-2.3.3.ebuild
+++ /dev/null
@@ -1,216 +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/xdtv/xdtv-2.3.3.ebuild,v 1.9 2007/06/12 14:01:27 zzam Exp $
-
-WANT_AUTOMAKE="1.7"
-WANT_AUTOCONF="2.5"
-
-inherit font multilib autotools flag-o-matic eutils
-
-IUSE="alsa jpeg encode ffmpeg xvid lirc xinerama neXt Xaw3d mmx zvbi aqua_theme
-carbone_theme xv debug x264 ogg png aac nls"
-# dvb support disabled, it might not work with external ffmpeg
-
-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 )
- )"
- IUSE="${IUSE} linguas_${lang}"
-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 ) )
- !neXt? ( !Xaw3d? ( || ( x11-libs/libXaw <virtual/x11-7 ) ) )
- xvid? ( >=media-libs/xvid-1.1 )
- 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-1.0_alpha5
- media-libs/libvorbis )
- png? ( media-libs/libpng )
- aac? ( media-libs/faac )
- nls? ( virtual/libintl )
- || ( ( x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXpm
- x11-libs/libXt
- x11-libs/libXmu
- x11-libs/libXxf86vm
- x11-libs/libXxf86dga
- x11-libs/libXv
- x11-apps/xset
- xinerama? ( x11-libs/libXinerama )
- ) <virtual/x11-7 )"
-
-# dvb? ( media-tv/linuxtv-dvb-headers )
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- || ( ( x11-proto/videoproto
- x11-apps/bdftopcf
- x11-apps/mkfontdir
- x11-apps/mkfontscale
- xinerama? ( x11-proto/xineramaproto )
- ) <virtual/x11-7 )"
-# Make sure the assembler USE flags are unmasked on amd64
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
-
-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}"
-
- epatch "${FILESDIR}/libxdtv-i18n-all-1.3.0-ldflags.patch"
-
- econf || die "econf failed"
- emake || die "emake failed"
-}
-
-extension_install() {
- einfo "Installing ${1}"
- cd ${WORKDIR}/${1} \
- && emake 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.am"
- # Disable /usr/share/xdtv/icons/* installation
- sed -i -e '/^install-data-local:/,${\:share/xdtv/icons:d}' ${S}/Makefile.am
-
- cd "${S}"
- epatch "${FILESDIR}/${PN}-2.3.0-setXid.patch"
- epatch "${FILESDIR}/${PN}-2.3.2-parallel-install.patch"
- epatch "${FILESDIR}/${P}-external-ffmpeg.patch"
-
- # ffmpeg doesn'g use libtool, so the condition for PIC code
- # is __PIC__, not PIC.
- sed -i -e 's/#\(\(.*def *\)\|\(.*defined *\)\|\(.*defined(*\)\)PIC/#\1__PIC__/' \
- libavcodec/i386/dsputil_mmx{.c,_rnd.h,_avg.h} \
- libavcodec/msmpeg4.c \
- || die "sed failed (__PIC__)"
-
- eautoreconf
-}
-
-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
-
- myconf="${myconf} $(use_enable mmx)"
-
- has_version '<x11-base/xorg-x11-7.0' && \
- appdefaultsdir="/etc/X11/app-defaults" || \
- appdefaultsdir="/usr/share/X11/app-defaults"
-
- 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) \
- --disable-dvb \
- --with-external-ffmpeg \
- $(use_enable ogg) \
- $(use_enable png) \
- $(use_enable aac faac) \
- $(use_enable nls) \
- $(use_enable x264) \
- --enable-pixmaps \
- --disable-cpu-detection \
- --disable-divx4linux \
- --with-appdefaultsdir=${appdefaultsdir} \
- ${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() {
- emake 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
-
- # Remove fonts from being installed by autotools
- rm -rf "${D}/usr/$(get_libdir)/X11"
-
- # 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
- elog "Please note that this ebuild created a suid-binary:"
- elog "/usr/bin/xdtv_v4l-conf"
- echo
- elog "The OSD font has moved. You probably should add"
- elog "this path to your X configuration:"
- elog "/usr/share/fonts/${PN}"
- echo
-}