Version bump, fixing bug #231195. Thanks Theo Chatzimichos for providing an updated ebuild and patch. Remove old.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64

8 files changed, 81 insertions, 206 deletions

diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index 606fcb7ab48f..645aa8794300 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/kaffeine
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.91 2008/04/13 15:54:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.92 2008/08/28 22:40:28 tgurr Exp $
+
+*kaffeine-0.8.7 (28 Aug 2008)
+
+  28 Aug 2008; Timo Gurr <tgurr@gentoo.org>
+  +files/kaffeine-0.8.7-respectcflags.patch, -files/kaffeine-with-xcb.patch,
+  -files/kaffeine-with-xcb-r1.patch, -kaffeine-0.8.5.ebuild,
+  -kaffeine-0.8.5-r1.ebuild, -kaffeine-0.8.5-r2.ebuild,
+  +kaffeine-0.8.7.ebuild:
+  Version bump, fixing bug #231195. Thanks Theo Chatzimichos for providing
+  an updated ebuild and patch. Remove old.
 
   13 Apr 2008; Raúl Porcel <armin76@gentoo.org> kaffeine-0.8.6.ebuild:
   sparc stable wrt #217216
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 5d87a9265c50..cfeff2ed006c 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,11 +1,8 @@
 AUX kaffeine-0.8.5-respectcflags.patch 2554 RMD160 1f3d06ee37f2b36f8f79951948221e5159b121b3 SHA1 55dbe435bd6038b00cd39d367060806f5b1a39c6 SHA256 e2ff1f6477a8fc3800d96b1e1240bc6acc7392ded6883b18f667a9a3c233dfcf
-AUX kaffeine-with-xcb-r1.patch 664 RMD160 814226d57f9a1e440cfca35309188de738e5d117 SHA1 a351af6f6e7132ff5dfabbc852cacf9dc792fecb SHA256 fb8953f6a3c2f003bf7283fbdaa7c6d055de046fad6aafd66881811400004277
-AUX kaffeine-with-xcb.patch 844 RMD160 799c57a4704d62430c65dcef1d9ffa22b63cb46f SHA1 afd8f700a1daa9416a926c0e9c230f8d9f8080ea SHA256 558abec653c48197b34033caf8a5711289ddae11516eefffd752210186b4cd2b
-DIST kaffeine-0.8.5.tar.bz2 2887566 RMD160 f32004e87b790bdd137c455234cbf3c2776fd3f3 SHA1 2a993555cf1b4295230a69fd74d68ed06c3e5ae8 SHA256 653090c84c11eaea20a4b7b9a863972d16fea7d8db148be12b26291c162b0f97
+AUX kaffeine-0.8.7-respectcflags.patch 2918 RMD160 6232b1b0f0203eb6f6f404ffa63bde444a6fcbd3 SHA1 99783aa52a1fcd5568c6a850f4fef33cb6fb200f SHA256 1798a5bddb992ab12fbdcaab8d0afc1e8b037ff0ff8f938973c7d7c1d766d0b2
 DIST kaffeine-0.8.6.tar.bz2 2923224 RMD160 260da3f329d76fd5e372396e52f32dc175206313 SHA1 508977f591fd31474548dfb92e1073b656cf65fa SHA256 77485636b1a279ed4e3431947eeda096f41e84ace481ffb0b9fd70d09676c0b7
-EBUILD kaffeine-0.8.5-r1.ebuild 2012 RMD160 b03327947db400c42626ee66043cf8df8335b0cf SHA1 c73239375cbb1c2245e064321943e05a615c89b6 SHA256 e39f5fea8aff0c2890b05679efd7d2ab6a107329cacbf3dbaf8fbd1348d97608
-EBUILD kaffeine-0.8.5-r2.ebuild 2201 RMD160 108d526588580f186744a81528b372706a284406 SHA1 8c6531db0cac4689d680db189c177d8d9e6a2c32 SHA256 01221c906429f4c3eea6bea3c76725d7eb616c17c1ae37930a59d63696acec0f
-EBUILD kaffeine-0.8.5.ebuild 1840 RMD160 f6e48daabbbfbf9b4ffb8634c6db9bb3b5c81b6f SHA1 5e788e80df2eb7872889d32f6949d58fb534d473 SHA256 a750f5732e0960ca93eafc340e11292a4f724189a6e6559bd80585a9007ec5e1
+DIST kaffeine-0.8.7.tar.bz2 2973819 RMD160 f269b4f5e18faeecfce605e010bcd0432b206c0e SHA1 46c0d36601330768b7c2082a1ef977b173678255 SHA256 fb65306f04138a990b2a66a3709e3038e7eb7e3254af09f21a4e7075ec949e1d
 EBUILD kaffeine-0.8.6.ebuild 2149 RMD160 ede5e66829568021b1b7d9da836b4a07a6426d78 SHA1 4c91698dd8d4ad169873eacae59b844218337bed SHA256 3c9c3691db53eeef6ad356fdcc7ffc0e4e099ae6b4c74caaa4653eec1e8f9fa0
-MISC ChangeLog 13643 RMD160 871a15afa14e5014b7f8d4ca288067ec187108c9 SHA1 e055a8ab217964eef8cd9b726246c76d78815efd SHA256 3ba9fd97814069cc1c5a5e373190cb69c59482bcf41d3814e79e2582dc80bc9b
+EBUILD kaffeine-0.8.7.ebuild 2152 RMD160 83808f089e32d9307d27f366ff2941fc9ea3c66a SHA1 4be67a5200dbb9496f53f7ac1f38bff6c416e2b7 SHA256 c44589706044f464a29f47b9ca4f8f22545e197141c2513c73e843127aad75d9
+MISC ChangeLog 14055 RMD160 15416cfddc8c4ff09fa797346e6dcf56d5b4be17 SHA1 1b9be7241c99e98c5cfbac8813f4320fa91cb104 SHA256 477318c07e5b2a49b3296b4d93545aa4b31f9003661b98234cfcc94c1b9369c7
 MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a
diff --git a/media-video/kaffeine/files/kaffeine-0.8.7-respectcflags.patch b/media-video/kaffeine/files/kaffeine-0.8.7-respectcflags.patch
new file mode 100644
index 000000000000..79bcd0ceeecd
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-0.8.7-respectcflags.patch
@@ -0,0 +1,60 @@
+Don't overwrite the user variable CFLAGS< use AM_CFLAGS or nothing.
+
+Index: kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
+===================================================================
+--- kaffeine-0.8.7.orig/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
+@@ -8,5 +8,3 @@
+            dvbfe.c \
+            dvbnet.c \
+            dvbvideo.c
+-
+-CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+Index: kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
+===================================================================
+--- kaffeine-0.8.7.orig/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
+@@ -18,4 +18,4 @@ libdvben50221_la_SOURCES = asn_1.c \
+            en50221_session.c \
+            en50221_transport.c 
+ 
+-CFLAGS  = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS  = -DLOG_LEVEL=1
+Index: kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
+===================================================================
+--- kaffeine-0.8.7.orig/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
+@@ -15,5 +15,3 @@ libdvbdvb_la_SOURCES = bat_section.c \
+            tot_section.c \
+            tva_container_section.c \
+            types.c
+-
+-CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+Index: kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
+===================================================================
+--- kaffeine-0.8.7.orig/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
+@@ -16,4 +16,3 @@
+        ./dvb/libdvbdvb.la \
+        ./atsc/libdvbatsc.la
+
+-CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+Index: kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
+===================================================================
+--- kaffeine-0.8.7.orig/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
+@@ -8,5 +8,3 @@ libdvbmpeg_la_SOURCES = cat_section.c \
+            pat_section.c \
+            pmt_section.c \
+            tsdt_section.c
+-
+-CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+Index: kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/atsc/Makefile.am
+===================================================================
+--- kaffeine-0.8.7.orig/kaffeine/src/input/dvb/lib/libucsi/atsc/Makefile.am
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/atsc/Makefile.am
+@@ -14,4 +14,3 @@
+                tvct_section.c \
+                types.c
+
+-CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
diff --git a/media-video/kaffeine/files/kaffeine-with-xcb-r1.patch b/media-video/kaffeine/files/kaffeine-with-xcb-r1.patch
deleted file mode 100644
index b4f60f3d0aef..000000000000
--- a/media-video/kaffeine/files/kaffeine-with-xcb-r1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- kaffeine-0.8.4/kaffeine/configure.in.in.orig	2007-04-14 01:31:16.000000000 +0200
-+++ kaffeine-0.8.4/kaffeine/configure.in.in	2007-04-14 01:38:39.000000000 +0200
-@@ -227,12 +227,15 @@
- dnl check for xcb
- dnl -------------
- 
-+AC_ARG_WITH([xcb], [AS_HELP_STRING([--without-xcb], [build without xcb support])],,
-+  [with_xcb=yes])
-+
- AC_MSG_CHECKING([for xcb and xine-lib >= 1.1.5])
- 
- CFLAGS_XCB=""
- LIB_XCB=""
- 
--if "$PKG_CONFIG" --exists "xcb >= 1.0 libxine >= 1.1.5" ; then
-+if test "$with_xcb" != "no" && "$PKG_CONFIG" --exists "xcb >= 1.0 libxine >= 1.1.5" ; then
- 	with_xcb=yes
- 	CFLAGS_XCB=`"$PKG_CONFIG" --cflags xcb`
- 	LIB_XCB=`"$PKG_CONFIG" --libs xcb`
diff --git a/media-video/kaffeine/files/kaffeine-with-xcb.patch b/media-video/kaffeine/files/kaffeine-with-xcb.patch
deleted file mode 100644
index 56026eb82f32..000000000000
--- a/media-video/kaffeine/files/kaffeine-with-xcb.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- kaffeine-0.8.4/configure.in.orig	2007-04-14 01:31:16.000000000 +0200
-+++ kaffeine-0.8.4/configure.in	2007-04-14 01:38:39.000000000 +0200
-@@ -227,12 +227,15 @@
- dnl check for xcb
- dnl -------------
- 
-+AC_ARG_WITH([xcb], [AS_HELP_STRING([--without-xcb], [build without xcb support])],,
-+  [with_xcb=yes])
-+
- AC_MSG_CHECKING([for xcb and xine-lib >= 1.1.5])
- 
- CFLAGS_XCB=""
- LIB_XCB=""
- 
--if "$PKG_CONFIG" --exists "xcb >= 1.0 libxine >= 1.1.5" ; then
-+if test "$with_xcb" != "no" && "$PKG_CONFIG" --exists "xcb >= 1.0 libxine >= 1.1.5" ; then
- 	with_xcb=yes
- 	CFLAGS_XCB=`"$PKG_CONFIG" --cflags xcb`
- 	LIB_XCB=`"$PKG_CONFIG" --libs xcb`
-@@ -246,6 +249,7 @@
- AC_SUBST([CFLAGS_XCB])
- AC_SUBST([LIB_XCB])
- 
-+AM_CONDITIONAL([with_xcb], [test "$with_xcb" = "yes"])
- dnl ---------------------
- dnl check for DVB headers
- dnl ---------------------
diff --git a/media-video/kaffeine/kaffeine-0.8.5-r1.ebuild b/media-video/kaffeine/kaffeine-0.8.5-r1.ebuild
deleted file mode 100644
index 78a2e0346236..000000000000
--- a/media-video/kaffeine/kaffeine-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.5-r1.ebuild,v 1.3 2008/04/10 19:32:13 tgurr Exp $
-
-inherit eutils kde flag-o-matic
-
-DESCRIPTION="Media player for KDE using xine and gstreamer backends."
-HOMEPAGE="http://kaffeine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kaffeine/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="dvb gstreamer xinerama vorbis encode kdehiddenvisibility xcb"
-
-RDEPEND=">=media-libs/xine-lib-1
-	xcb? ( >=x11-libs/libxcb-1.0
-		>=media-libs/xine-lib-1.1.5 )
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		=media-plugins/gst-plugins-xvideo-0.10* )
-	media-sound/cdparanoia
-	encode? ( media-sound/lame )
-	vorbis? ( media-libs/libvorbis )
-	x11-libs/libXtst"
-
-DEPEND="${RDEPEND}
-	dvb? ( media-tv/linuxtv-dvb-headers )
-	x11-proto/inputproto"
-
-need-kde 3.5.4
-
-pkg_setup() {
-	if use xcb && ! built_with_use --missing false media-libs/xine-lib xcb; then
-		eerror "To enable the xcb useflag on this package you need"
-		eerror "the useflag xcb enabled on media-libs/xine-lib."
-		eerror "Please emerge media-libs/xine-lib again with the xcb useflag"
-		eerror "enabled."
-		die "Missing xcb useflag on media-libs/xine-lib."
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}"/kaffeine-with-xcb-r1.patch
-	epatch "${FILESDIR}"/kaffeine-0.8.5-respectcflags.patch
-	rm -f "${S}"/configure
-}
-
-src_compile() {
-	# see bug #143168
-	replace-flags -O3 -O2
-
-	# Workarund bug #198973
-	local save_CXXFLAGS="${CXXFLAGS}"
-	append-flags -std=gnu89
-	export CXXFLAGS="${save_CXXFLAGS}"
-
-	local myconf="${myconf}
-		$(use_with xinerama)
-		$(use_with dvb)
-		$(use_with gstreamer)
-		$(use_with vorbis oggvorbis)
-		$(use_with xcb)
-		$(use_with encode lame)"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# Remove this, as kdelibs 3.5.4 provides it
-	rm -f "${D}"/usr/share/mimelnk/application/x-mplayer2.desktop
-}
diff --git a/media-video/kaffeine/kaffeine-0.8.5.ebuild b/media-video/kaffeine/kaffeine-0.8.5.ebuild
deleted file mode 100644
index 47656a20817a..000000000000
--- a/media-video/kaffeine/kaffeine-0.8.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.5.ebuild,v 1.8 2008/04/10 19:32:13 tgurr Exp $
-
-inherit eutils kde flag-o-matic autotools
-
-DESCRIPTION="Media player for KDE using xine and gstreamer backends."
-HOMEPAGE="http://kaffeine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kaffeine/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="dvb gstreamer xinerama vorbis encode kdehiddenvisibility xcb"
-
-RDEPEND=">=media-libs/xine-lib-1
-	xcb? ( >=x11-libs/libxcb-1.0
-		>=media-libs/xine-lib-1.1.5 )
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		=media-plugins/gst-plugins-xvideo-0.10* )
-	media-sound/cdparanoia
-	encode? ( media-sound/lame )
-	vorbis? ( media-libs/libvorbis )
-	x11-libs/libXtst"
-
-DEPEND="${RDEPEND}
-	dvb? ( media-tv/linuxtv-dvb-headers )
-	x11-proto/inputproto"
-
-need-kde 3.5.4
-
-pkg_setup() {
-	if use xcb && ! built_with_use --missing false media-libs/xine-lib xcb; then
-		eerror "To enable the xcb useflag on this package you need"
-		eerror "the useflag xcb enabled on media-libs/xine-lib."
-		eerror "Please emerge media-libs/xine-lib again with the xcb useflag"
-		eerror "enabled."
-		die "Missing xcb useflag on media-libs/xine-lib."
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-	cd "${S}"
-	# allow $(with_xcb)
-	epatch "${FILESDIR}"/kaffeine-with-xcb.patch
-	eautoconf
-}
-
-src_compile() {
-	# see bug #143168
-	replace-flags -O3 -O2
-
-	local myconf="${myconf}
-		$(use_with xinerama)
-		$(use_with dvb)
-		$(use_with gstreamer)
-		$(use_with vorbis oggvorbis)
-		$(use_with xcb)
-		$(use_with encode lame)"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# Remove this, as kdelibs 3.5.4 provides it
-	rm -f "${D}"/usr/share/mimelnk/application/x-mplayer2.desktop
-}
diff --git a/media-video/kaffeine/kaffeine-0.8.5-r2.ebuild b/media-video/kaffeine/kaffeine-0.8.7.ebuild
index d621433eacd2..a87227291496 100644
--- a/media-video/kaffeine/kaffeine-0.8.5-r2.ebuild
+++ b/media-video/kaffeine/kaffeine-0.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.5-r2.ebuild,v 1.2 2008/04/10 19:32:13 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.7.ebuild,v 1.1 2008/08/28 22:40:28 tgurr Exp $
 
 inherit eutils kde flag-o-matic
 
@@ -11,11 +11,11 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="dvb gstreamer xinerama vorbis encode kdehiddenvisibility xcb"
+IUSE="dvb gstreamer xinerama vorbis encode xcb"
+# kdehiddenvisibility removed due to bug 207002.
 
-RDEPEND=">=media-libs/xine-lib-1
-	xcb? ( >=x11-libs/libxcb-1.0
-		>=media-libs/xine-lib-1.1.5 )
+RDEPEND=">=media-libs/xine-lib-1.1.9
+	xcb? ( >=x11-libs/libxcb-1.0 )
 	gstreamer? ( =media-libs/gstreamer-0.10*
 		=media-plugins/gst-plugins-xvideo-0.10* )
 	media-sound/cdparanoia
@@ -42,8 +42,7 @@ pkg_setup() {
 src_unpack() {
 	kde_src_unpack
 	cd "${S}"
-	epatch "${FILESDIR}"/kaffeine-with-xcb-r1.patch
-	epatch "${FILESDIR}"/kaffeine-0.8.5-respectcflags.patch
+	epatch "${FILESDIR}"/kaffeine-0.8.7-respectcflags.patch
 	rm -f "${S}"/configure
 }