removed un_ifdef handling breaks vdr-setup compile, readdded un_ifdef handling

Package-Manager: portage-2.1.10.11/cvs/Linux i686

3 files changed, 71 insertions, 9 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index b86d4a036f56..f7d634ea7dd8 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vdr
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.157 2012/04/29 16:15:55 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.158 2012/04/30 00:38:55 hd_brummy Exp $
+
+  30 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.6.0_p2-r9.ebuild:
+  removed un_ifdef handling breaks vdr-setup compile, readdded un_ifdef
+  handling
 
 *vdr-1.6.0_p2-r9 (29 Apr 2012)
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index dd6a322b80c6..d084831159d0 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -15,14 +15,14 @@ DIST vdr-1.6.0-2.diff 17906 RMD160 256e6e0544f7a50eac07f91fd7c0664853e4396c SHA1
 DIST vdr-1.6.0.tar.bz2 593172 RMD160 b190901fcaa5507be37547dfd5cba10887316b09 SHA1 203a03ce4a39e8c70e0a64d7d94b7f5f17f03e7d SHA256 9993a6c20b35f19d46f63c13f2f5fc71036d27ee09bcf9c7e57474ba3b2cb8e6
 EBUILD vdr-1.6.0_p2-r7.ebuild 11487 RMD160 c59fd46d2510d1892b68230c03cf24a24586fd7f SHA1 89e467abbce351f642475a234b223e0eb80a883f SHA256 32a60a57b47d1b1c7a545d4c793182edc0ab9a0e3ed6bc2dcacd279da8b30d22
 EBUILD vdr-1.6.0_p2-r8.ebuild 11122 RMD160 0a83009636fb64828f7e3e173f0303f12a7059d8 SHA1 2d2e22a5fb8ff1e173043fc74c39f145723adcae SHA256 eee412b3b43fcfd3ffeacc43184bb19fe6782885df5af87b6a8c02135329759c
-EBUILD vdr-1.6.0_p2-r9.ebuild 10617 RMD160 8692a805f89f9b7268942c83b3567b48e2585df9 SHA1 943b7fa72557f4ef99cee82e58950dfd5aa9c414 SHA256 8ec0992e9acb28f41c729966b7572bf5cc5af48d71f0597a5524182706df8e2b
-MISC ChangeLog 28420 RMD160 204aed538aaaddbaa02970115d309eb056239ff3 SHA1 11eceabd06689b4ed0cbf2913a4ecf5ca4807ff7 SHA256 b90867a776884684b3c3d429837222aeb4c138f833f5df5cb5c37017a4119b8f
+EBUILD vdr-1.6.0_p2-r9.ebuild 11756 RMD160 39422e840d1ab23922e0ce867ad7a411b6d46daf SHA1 68cad4b817116be5683a55aba4ff816f34e9881b SHA256 472496eef591614bbca8275017da309174fbaeb8f9c8ef781b0662c123f9429e
+MISC ChangeLog 28583 RMD160 4392a5a3509a4bce90e01a8625d556ceae166eeb SHA1 4fbf3951ad3ebf98f27b33f8763051529ba7f703 SHA256 f79a90530950b450b9cbae7abcbff275522ffcc0ad78dace348350eb141b15d1
 MISC metadata.xml 4220 RMD160 81bf8cd288b74bbfc0522b754100045980db7095 SHA1 0d73555d38505f5be3d6e0dcfbe7f706483e35d8 SHA256 d04d296b5a155a2d05e1ec5d6681c6d91fcb430f557e9a2416045090a39c8cc1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFPnWlEdn07HTTCgIoRAu/oAJ4nKw1bLaSzbG5EIY+n6H+8W1ZaiACgiMxf
-tnnwSIJqM/DJ+m5yr67Ycp8=
-=Bl3V
+iD8DBQFPnd8rdn07HTTCgIoRAmqHAKCvjAjd5xs8DXtov8rgVLobEhQcbACglwO6
+7PsI1EC8WNXrE/tOXB3K3rY=
+=nvCJ
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.6.0_p2-r9.ebuild b/media-video/vdr/vdr-1.6.0_p2-r9.ebuild
index cc01a7de5056..014c808d87ac 100644
--- a/media-video/vdr/vdr-1.6.0_p2-r9.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p2-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r9.ebuild,v 1.1 2012/04/29 16:15:55 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r9.ebuild,v 1.2 2012/04/30 00:38:55 hd_brummy Exp $
 
 EAPI="4"
 
@@ -56,6 +56,7 @@ COMMON_DEPEND="virtual/jpeg
 
 DEPEND="${COMMON_DEPEND}
 	>=virtual/linuxtv-dvb-headers-5
+	dev-util/unifdef
 	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
 
 RDEPEND="${COMMON_DEPEND}
@@ -116,6 +117,61 @@ extensions_all_defines() {
 		| tr '[:upper:]' '[:lower:]'
 }
 
+extensions_all_defines_unset() {
+	# extract all possible settings for extensions-patch
+	# and convert them to -U... for unifdef
+	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?/-UUSE_/' -e 's/ .*//' \
+		Make.config.template \
+		| tr '\n' ' '
+}
+
+do_unifdef() {
+	ebegin "Unifdef sources"
+	local mf="Makefile.get"
+	cat <<'EOT' > $mf
+include Makefile
+show_def:
+	@echo $(DEFINES)
+show_src_files:
+	@echo $(OBJS:%.o=%.c)
+EOT
+
+	local DEFINES=$(extensions_all_defines_unset)
+
+	local RAW_DEFINES=$(make -f "$mf" show_def)
+	local VDR_SRC_FILES=$(make -f "$mf" show_src_files)
+	local KEEP_FILES=""
+	rm "$mf"
+
+	local def
+	for def in $RAW_DEFINES; do
+		case "${def}" in
+			-DUSE*)
+				DEFINES="${DEFINES} ${def}"
+				;;
+		esac
+	done
+
+	local f
+	for f in *.c; do
+
+		# Removing the src files the Makefile does not use for compiling vdr
+		if ! has $f ${VDR_SRC_FILES} ${KEEP_FILES}; then
+			rm -f ${f} ${f%.c}.h
+			continue
+		fi
+
+		unifdef ${DEFINES} "$f" > "tmp.$f"
+		mv "tmp.$f" "$f"
+	done
+	for f in *.h; do
+		unifdef ${DEFINES} "$f" > "tmp.$f"
+		mv "tmp.$f" "$f"
+		[[ -s $f ]] || rm "$f"
+	done
+	eend 0
+}
+
 lang_linguas() {
 	LING1=$( cat /etc/make.conf | grep LINGUAS | sed -e "s:LINGUAS=::" -e "s:\"::g" )
 }
@@ -185,7 +241,7 @@ src_prepare() {
 		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
 		epatch "${FILESDIR}"/vdr-1.6.0-extensions-72-gcc-4.4.diff
 		epatch "${FILESDIR}"/vdr-1.6.0-shared-tinyxml.diff
-		epatch "${FILESDIR}/${P}_linguas.diff"
+		epatch "${FILESDIR}"/vdr-1.6.0_p2_linguas.diff
 
 		# This allows us to start even if some plugin does not exist
 		# or is not loadable.
@@ -235,6 +291,8 @@ src_prepare() {
 		emake .dependencies >/dev/null
 		eend $? "make depend failed"
 
+		[[ -z "$NO_UNIFDEF" ]] && do_unifdef
+
 		use iptv && sed -i sources.conf -e 's/^#P/P/'
 	fi
 
@@ -249,7 +307,7 @@ src_prepare() {
 
 	echo -e ${CAPS} > "${CAP_FILE}"
 
-	# LINGUAS handling support
+	# LINGUAS handling
 	einfo "\n \t VDR supports now the LINGUAS values"
 
 	lang_po