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

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64)

3 files changed, 60 insertions, 46 deletions

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 ---------------------