Properly run autotools for a KDE package (avoid double configure run). Properly respect user CFLAGS on DVB-related libraries.

Package-Manager: portage-2.1.3.19

6 files changed, 181 insertions, 5 deletions

diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index 06f83f1592e0..9748d6f15d55 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/kaffeine
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.81 2007/10/08 17:23:08 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.82 2007/11/12 19:24:05 flameeyes Exp $
+
+*kaffeine-0.8.5-r1 (12 Nov 2007)
+
+  12 Nov 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kaffeine-with-xcb-r1.patch,
+  +files/kaffeine-0.8.5-respectcflags.patch, +kaffeine-0.8.5-r1.ebuild:
+  Properly run autotools for a KDE package (avoid double configure run).
+  Properly respect user CFLAGS on DVB-related libraries.
 
   08 Oct 2007; Markus Rothe <corsair@gentoo.org> kaffeine-0.8.5.ebuild:
   Stable on ppc64; bug #186896
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index ff5279f40793..667287889841 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,16 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kaffeine-0.8.5-respectcflags.patch 2554 RMD160 1f3d06ee37f2b36f8f79951948221e5159b121b3 SHA1 55dbe435bd6038b00cd39d367060806f5b1a39c6 SHA256 e2ff1f6477a8fc3800d96b1e1240bc6acc7392ded6883b18f667a9a3c233dfcf
+MD5 2f98a67720d51237811c6603326501f1 files/kaffeine-0.8.5-respectcflags.patch 2554
+RMD160 1f3d06ee37f2b36f8f79951948221e5159b121b3 files/kaffeine-0.8.5-respectcflags.patch 2554
+SHA256 e2ff1f6477a8fc3800d96b1e1240bc6acc7392ded6883b18f667a9a3c233dfcf files/kaffeine-0.8.5-respectcflags.patch 2554
+AUX kaffeine-with-xcb-r1.patch 664 RMD160 814226d57f9a1e440cfca35309188de738e5d117 SHA1 a351af6f6e7132ff5dfabbc852cacf9dc792fecb SHA256 fb8953f6a3c2f003bf7283fbdaa7c6d055de046fad6aafd66881811400004277
+MD5 26a41e77513eb9685c805b2657d32298 files/kaffeine-with-xcb-r1.patch 664
+RMD160 814226d57f9a1e440cfca35309188de738e5d117 files/kaffeine-with-xcb-r1.patch 664
+SHA256 fb8953f6a3c2f003bf7283fbdaa7c6d055de046fad6aafd66881811400004277 files/kaffeine-with-xcb-r1.patch 664
 AUX kaffeine-with-xcb.patch 844 RMD160 799c57a4704d62430c65dcef1d9ffa22b63cb46f SHA1 afd8f700a1daa9416a926c0e9c230f8d9f8080ea SHA256 558abec653c48197b34033caf8a5711289ddae11516eefffd752210186b4cd2b
 MD5 d0a8ec57dae31ca92ec2431d61a0901d files/kaffeine-with-xcb.patch 844
 RMD160 799c57a4704d62430c65dcef1d9ffa22b63cb46f files/kaffeine-with-xcb.patch 844
 SHA256 558abec653c48197b34033caf8a5711289ddae11516eefffd752210186b4cd2b files/kaffeine-with-xcb.patch 844
 DIST kaffeine-0.8.5.tar.bz2 2887566 RMD160 f32004e87b790bdd137c455234cbf3c2776fd3f3 SHA1 2a993555cf1b4295230a69fd74d68ed06c3e5ae8 SHA256 653090c84c11eaea20a4b7b9a863972d16fea7d8db148be12b26291c162b0f97
+EBUILD kaffeine-0.8.5-r1.ebuild 1872 RMD160 a84479dcc9c85ba9454293dd3ddf21268223d1ba SHA1 7282c5d82a545eab9310349658873a9aa95c94a2 SHA256 98feea4041327abf61990efbc589e960ac75319654fbd4a666aa847e98bb9889
+MD5 63e9386cded719e6b09ba3438f2da389 kaffeine-0.8.5-r1.ebuild 1872
+RMD160 a84479dcc9c85ba9454293dd3ddf21268223d1ba kaffeine-0.8.5-r1.ebuild 1872
+SHA256 98feea4041327abf61990efbc589e960ac75319654fbd4a666aa847e98bb9889 kaffeine-0.8.5-r1.ebuild 1872
 EBUILD kaffeine-0.8.5.ebuild 1817 RMD160 e79e9e99f52083fad5ed16927d6ff91767fa97cf SHA1 b8dfb62d8f86c1d9f8d37b4671a8308419dbd97f SHA256 2785d3db6e3d978448a64c2b16c82831e8ac68c3f314f20e475f01aab677ad97
 MD5 22ed8e4d1a6489e4e3c0af03c3f6c976 kaffeine-0.8.5.ebuild 1817
 RMD160 e79e9e99f52083fad5ed16927d6ff91767fa97cf kaffeine-0.8.5.ebuild 1817
 SHA256 2785d3db6e3d978448a64c2b16c82831e8ac68c3f314f20e475f01aab677ad97 kaffeine-0.8.5.ebuild 1817
-MISC ChangeLog 12102 RMD160 4731294d1a81116aa78f5503486b7a412f0adc66 SHA1 9c1e4b8de697a3717382081b586f67f4378e40c2 SHA256 3e1d12482c227c06988ccd43b399b71c845514e88fb3a8ed6e663b040b6d9d50
-MD5 9c6c27140870ccbc27698f7ecf9774ee ChangeLog 12102
-RMD160 4731294d1a81116aa78f5503486b7a412f0adc66 ChangeLog 12102
-SHA256 3e1d12482c227c06988ccd43b399b71c845514e88fb3a8ed6e663b040b6d9d50 ChangeLog 12102
+MISC ChangeLog 12431 RMD160 1bf9851450e83afb3b6872ac96eabaa22cbb2b61 SHA1 5ce6d38008faed06a8e8d805452d885a67b71c5c SHA256 10acae7e9480f47a712bcdeb13fd92dbce7482a4eef5581292b0d4109fec6f52
+MD5 92975596bd1381c0aca3bb889f8f182e ChangeLog 12431
+RMD160 1bf9851450e83afb3b6872ac96eabaa22cbb2b61 ChangeLog 12431
+SHA256 10acae7e9480f47a712bcdeb13fd92dbce7482a4eef5581292b0d4109fec6f52 ChangeLog 12431
 MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a
 MD5 80b81e0016b1f3cb6c95459a0e35fc87 metadata.xml 301
 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 metadata.xml 301
@@ -18,3 +33,13 @@ SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a metadata
 MD5 372ff1a48b0d9d6dba88862aa71dc01b files/digest-kaffeine-0.8.5 250
 RMD160 3b2012e3259d433f6ce376d991e7002a0acc4073 files/digest-kaffeine-0.8.5 250
 SHA256 f4f8a815acf0d623217e9a36b4332dff3d3bedb5c63f8131aab764013fca74a5 files/digest-kaffeine-0.8.5 250
+MD5 372ff1a48b0d9d6dba88862aa71dc01b files/digest-kaffeine-0.8.5-r1 250
+RMD160 3b2012e3259d433f6ce376d991e7002a0acc4073 files/digest-kaffeine-0.8.5-r1 250
+SHA256 f4f8a815acf0d623217e9a36b4332dff3d3bedb5c63f8131aab764013fca74a5 files/digest-kaffeine-0.8.5-r1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHOKdJAiZjviIA2XgRAlUzAJ49PfWICP2otuUdiG+b1M6rKaaRWQCfWdOb
+glj7wqn6y50UDIFLt31l86w=
+=ocFO
+-----END PGP SIGNATURE-----
diff --git a/media-video/kaffeine/files/digest-kaffeine-0.8.5-r1 b/media-video/kaffeine/files/digest-kaffeine-0.8.5-r1
new file mode 100644
index 000000000000..ac5adc3b3acc
--- /dev/null
+++ b/media-video/kaffeine/files/digest-kaffeine-0.8.5-r1
@@ -0,0 +1,3 @@
+MD5 71814e7612f1f7e1b6cd954d352e4201 kaffeine-0.8.5.tar.bz2 2887566
+RMD160 f32004e87b790bdd137c455234cbf3c2776fd3f3 kaffeine-0.8.5.tar.bz2 2887566
+SHA256 653090c84c11eaea20a4b7b9a863972d16fea7d8db148be12b26291c162b0f97 kaffeine-0.8.5.tar.bz2 2887566
diff --git a/media-video/kaffeine/files/kaffeine-0.8.5-respectcflags.patch b/media-video/kaffeine/files/kaffeine-0.8.5-respectcflags.patch
new file mode 100644
index 000000000000..7ee3a07baa85
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-0.8.5-respectcflags.patch
@@ -0,0 +1,52 @@
+Don't overwrite the user variable CFLAGS< use AM_CFLAGS or nothing.
+
+Index: kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
+===================================================================
+--- kaffeine-0.8.5.orig/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
++++ kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
+@@ -7,5 +7,3 @@ libdvbapi_la_SOURCES = diseqc.c \
+            dvbdemux.c \
+            dvbfe.c \
+            dvbnet.c
+-
+-CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+Index: kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
+===================================================================
+--- kaffeine-0.8.5.orig/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
++++ kaffeine-0.8.5/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.5/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
+===================================================================
+--- kaffeine-0.8.5.orig/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
++++ kaffeine-0.8.5/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.5/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
+===================================================================
+--- kaffeine-0.8.5.orig/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
++++ kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
+@@ -13,5 +13,3 @@ libucsi_la_LDFLAGS = ./mpeg \
+ 
+ libucsi_la_LIBADD   = ./mpeg/libdvbmpeg.la \
+ 	./dvb/libdvbdvb.la
+-
+-CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+Index: kaffeine-0.8.5/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
+===================================================================
+--- kaffeine-0.8.5.orig/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
++++ kaffeine-0.8.5/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
diff --git a/media-video/kaffeine/files/kaffeine-with-xcb-r1.patch b/media-video/kaffeine/files/kaffeine-with-xcb-r1.patch
new file mode 100644
index 000000000000..b4f60f3d0aef
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-with-xcb-r1.patch
@@ -0,0 +1,19 @@
+--- 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/kaffeine-0.8.5-r1.ebuild b/media-video/kaffeine/kaffeine-0.8.5-r1.ebuild
new file mode 100644
index 000000000000..ebcb5a739d50
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-0.8.5-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2007 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.1 2007/11/12 19:24:05 flameeyes 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 )"
+
+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
+
+	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
+}