Fix building with latest automake-1.13, plus other improvements, see ChangeLog

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 47 insertions, 29 deletions

diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index ede61b8db052..b9efb4ed6b2d 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-pda/gtkpod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.125 2013/04/12 04:25:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.126 2013/05/01 19:09:18 ssuominen Exp $
+
+  01 May 2013; Samuli Suominen <ssuominen@gentoo.org> gtkpod-2.1.3-r1.ebuild:
+  Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER for automake-1.13
+  compability wrt #467598 by Ian Stakenvicius.
+  Punt GTK+ related "DEPRECATED" preprocessor flags for forward compability.
+  Fix USE="cdr" dependencies since the plug-in links to -lgstreamer-0.10.
+  Compress gst-element-check-0.10.m4 to SRC_URI instead of using hard DEPEND
+  for media-libs/gstreamer (as required by eautoreconf).
 
   12 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> gtkpod-2.1.3-r1.ebuild:
   Force more recent dev-util/anjuta too in addition to dev-libs/gdl
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index c54a0a158b19..daa3415b3a5c 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -3,18 +3,19 @@ Hash: SHA256
 
 AUX gtkpod-2.1.3-gdl-3.6.patch 1974 SHA256 98d71417880497d0e01f415656a343d08f9522fd0c48975e0cba92f10345b14b SHA512 354923ac41b9da3174c619a1282a48f5267cdfa269c557a41c27cbbd46a9c0d04cbefb70f6bb4373261285c9f80c8b2e530a0f202da00f1a6057aa641171fb93 WHIRLPOOL c1c4e06ce32680676f67eddd7cfeb766ac89d68f8ca8dbc26622d7142a6a511fb2ef6b94fe7b7f7762d1fe8413ce816774f7a13732db5a1e80734129a0b1d0cb
 AUX gtkpod-2.1.3-gold.patch 451 SHA256 420272234c4ebff9884c658fe8e1fe4721d8221c8a1f380d0aec45a14dc62ce2 SHA512 b6fb32ce37087beed99c475f747a6c79541821d836892ab4b8673ec49ca0a72ca6d55aaeaf8cf25895cc8e4f54341673e0f5616c5fa5ebc610250c641f4a2b13 WHIRLPOOL 0b34955fd576bb39619d87310a007acb454b7bbc0bcf0e9552d02779803b745321f49bdb5fde1d5e54892510b5089f042432ad41c1d1e0f12e0baa16082cedef
+DIST gst-element-check-0.10.m4.xz 420 SHA256 805f798eb9fcd79fdd7a937e321a7a61b7a1ff54aa1191270ae48e84f062d7f9 SHA512 07f59b8cdd65263b7f861cafcadbc22620ac66c80ae526dbfb4b305c64680dc353c18b18f347dcf8858dfd996802690b48ab3a539c42c5a75cf4d981ae61811c WHIRLPOOL 13c237320eb684a665e0c386aee4824bb7b1799fd9fc2afcb9b3825cca575ccf8e29e022856b29571f3332cdea5f9304dccc787b3621a402e9215df2b3cb4de5
 DIST gtkpod-2.1.3.tar.gz 3712898 SHA256 2b98352fe670a3d757c2b9cc4f8b910ca7fe8b8d9441764055075cfff16e4691 SHA512 6d59d1a2cce76d89ef7a47244de0edd7965916324c3681cba751316727fd6026c98128948a06db5778d889e582e200d29645e1beeb566ade865631a4c36ba5e5 WHIRLPOOL 02228c644292a2170c3bc11c2bbc6f56d63f5e7e074ddbc2a77c86ce225cbd1bafbedbc38c9e9e8df8569275a1da35b897b4d2e69b04eb55327c66d1a455bfe9
-EBUILD gtkpod-2.1.3-r1.ebuild 2813 SHA256 f16d71f42d49de8da8bdbd5c6d29f33bf0bd5fb7389b4537ea3529e883301ac6 SHA512 703fb24bfa925f576280fd17ec235772debe69692928d8da52f7528f81178115d9357c2bb82b2409f803ff2315d3f40b4644061616f6c46ce0c6e94ab993fb32 WHIRLPOOL 5fc45f69aa6f76574705b18545ce6318623c051b6cbd8f580ee58f63ebaf54b5ac53637a88bd0b668a2aea7c7600e7c2f2e203c81e8e3451703af7d17197b62e
-MISC ChangeLog 16614 SHA256 9e234824e1c3a180de57ee9f57ce8eff8d485d56d9b9c4ee7a03086855eb2126 SHA512 6aa7dbb2f8957bba6045a3530481b0e92fe33e74d43b965d6d383b42e5d218924bb938fda99ea614e37f1a5962a6e914685769a18fde3749bddfe1407303faa0 WHIRLPOOL 3a79991ce4c2d9068b68d7724e548056c6f4c8bd2f6af99d790cfb4e91f9c46457fb7b08f50b8a25eb914e0f37c8b8498d8e91bd1e634315e7eba504116ec1d0
+EBUILD gtkpod-2.1.3-r1.ebuild 3237 SHA256 a173469bdc3b47bcf2dc1e50668cea3720f4e7bf19809a157e5deaecdda04b51 SHA512 97980ee40f6f5057d378a7a0673aaf6a3b688bd0cec42699bc67613cdbbb2bb6a95ae8b8339ccfee0f8bc6d894b6292b1492613e1d044b0867f8752ebe556f8a WHIRLPOOL 3bfa3a8384a3b878e42eb01a4b6870fbd4235cd2b14a475117abd8bce74cda5f1a29a6443d2991de1dba1d9b687b1d68607dda84e35797df593be203254c7c87
+MISC ChangeLog 17095 SHA256 cc757300888ae2e44f9640f714c8a63ce0ca78c53103dbe5cf11cd51afaf954a SHA512 25471fcc0605c990783ca2cc81196d5eb07cba0392feef3d7bc850462363cb59542ab6651087854a4b9fc978081f96b747b49c3f17abe20ca49014bbeb3ad8c5 WHIRLPOOL efc48ce59b6bfff9faad248c451ab9e8a2703bd4020ab80fb1432fca8bf8be3c6f392050048623c3bf6e4c892a10a715b351f665d394189b42c519a1866046a2
 MISC metadata.xml 328 SHA256 95407831a5060771b1e952c41c4b644539008e700ddfc8fb7d8a1908393ae05a SHA512 75a4085abf4c8c3aed8b137909fdd0c595ea89b30a6b1dbc8a30558020d545f1be0c7e180ea4581e7eab3feca5563d0b1f167226b6becba18369ead910f70a04 WHIRLPOOL 7ceefc929392725906e812ca2673cbf1c45a64a9805f7dc1b76312359c0c81c762ff118619b073bc53acf889867f137454cce51f67f71ae3bc06f1347c4c3973
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRZ4yxAAoJEEdUh39IaPFN5t0H/RiHk5TGyx6aVTmTupCuF+mm
-BY/vBq6hTo0pjdVYLAK2YE/NrBFsE83FTt3IaKMVOcbL2hZw+IAWSyVUIEDAlpky
-0VrkiuSigD9DzCoKFPSmVhm8BqrGySj2wvqWHTGLoXgN8KJrjaH93BOuu4Fn6aQx
-ZFbgIv/kR7cv6UWYA87yX8WptKUd0nku33sU72h7cna50NdqdGJada49BfDewfYJ
-RTn2waNU038fK4iI0bBiCKEaxKtBCffFqnS+50IBH15VS0gcaD+l9IWQHKUUMqiY
-6bdPdpcogB2sH+qUU/w2IQ4gwTkIJ2Etipawel9ai00utPhuCxHbTOpLgu1ZRmo=
-=AWPb
+iQEcBAEBCAAGBQJRgWfvAAoJEEdUh39IaPFNeHAIAIZQoogGFg4LFfq1nOnnoJqZ
+xoimb9mSnigXR8DP4C8E4Kc1ADnk2dmi1AqD8E+OqgBPL2zs8wvt4P71GXgOdJE0
+x2l7Gb2LzsAr7xT1hjFyUknWOFxc67CHts4LtcOKP4sGY+kQ60DgQqE2Vg49OHZB
+v6zSx5s725QRyaNToSP+GxjzWXxCOpXT3jBkiwFvt+yEPp0PFakWb5y9n8bM3ucO
+46XrdHk+zZnNAHIpqcRKpNToyOGUhr1rvg9WyFH0AOeAvmRykngbfGcgm91ZvvpS
+vELrY2dbq7CpixSXWF7aeHe9OKbRY8o8NWT9S9rz9UFTmbPfA3rg0SSiq0S2UDA=
+=TUnC
 -----END PGP SIGNATURE-----
diff --git a/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild b/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild
index 42ccc6a69177..df62ca8661bd 100644
--- a/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild
+++ b/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild,v 1.5 2013/04/12 04:25:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild,v 1.6 2013/05/01 19:09:18 ssuominen Exp $
 
 EAPI=5
 
@@ -8,61 +8,70 @@ inherit autotools eutils gnome2-utils
 
 DESCRIPTION="A graphical user interface to the Apple productline"
 HOMEPAGE="http://gtkpod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	http://dev.gentoo.org/~ssuominen/gst-element-check-0.10.m4.xz"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="aac clutter curl cdr flac gstreamer mp3 vorbis webkit"
 
+# watch out for possible musicbrainz:5 compability in next version?
 COMMON_DEPEND="
 	>=dev-libs/gdl-3.6:3
 	>=dev-libs/glib-2.28.5
 	>=dev-libs/libxml2-2.7.7
 	>=dev-util/anjuta-3.6
-	>=media-libs/libgpod-0.7.0
+	>=media-libs/libgpod-0.8.2:=
 	>=media-libs/libid3tag-0.15
 	>=x11-libs/gtk+-3.0.8:3
 	aac? ( media-libs/faad2 )
 	clutter? ( media-libs/clutter-gtk:1.0 )
 	curl? ( >=net-misc/curl-7.10 )
-	cdr? (
-		>=app-cdr/brasero-3
-		media-libs/musicbrainz:3
-		)
 	flac? ( media-libs/flac )
-	gstreamer? ( >=media-libs/gst-plugins-base-0.10.25:0.10 )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10.25:0.10
+		>=media-libs/gst-plugins-base-0.10.25:0.10
+		cdr? (
+			>=app-cdr/brasero-3
+			media-libs/musicbrainz:3
+			)
+		)
 	mp3? ( media-sound/lame )
 	vorbis? (
 		media-libs/libvorbis
 		media-sound/vorbis-tools
 		)
 	webkit? ( >=net-libs/webkit-gtk-1.3:3 )"
+# to pull in at least -flac and -vorbis plugins , but others at the same time
 RDEPEND="${COMMON_DEPEND}
 	gstreamer? ( media-plugins/gst-plugins-meta:0.10 )"
 DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
-	media-libs/gstreamer:0.10
 	sys-devel/flex
 	sys-devel/gettext
 	virtual/os-headers
 	virtual/pkgconfig"
-# media-libs/gstreamer is always required for gst-element-check-0.10.m4 and
-# eautoreconf
+REQUIRED_USE="cdr? ( gstreamer )"
 
 src_prepare() {
-	# Make sure SLOT="4" is not used. Everyone should move from "3" to "5" directly.
-	sed -i -e '/PKG_CHECK_MODULES/s:libmusicbrainz4:&sLoT4iSdEpReCaTeD:' configure.ac || die
+	epatch \
+		"${FILESDIR}"/${P}-gdl-3.6.patch \
+		"${FILESDIR}"/${P}-gold.patch
 
+	sed -i -e 's:python:python2:' scripts/sync-palm-jppy.py || die
+	# punt deprecated flags for forward compability
+	# use more widely used musicbrainz:3 instead of :4
+	# use AC_CONFIG_HEADERS for automake-1.13 compability wrt #467598
+	sed -e 's:CLEANLINESS_FLAGS=".*:CLEANLINESS_FLAGS="":' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-e '/PKG_CHECK_MODULES/s:libmusicbrainz4:&sLoT4iSdEpReCaTeD:' \
+		-i configure.ac || die
 	# /path/to/install: '/path/to/app-pda/gtkpod-2.1.2_beta2/image/usr/share/gtkpod/data/rhythmbox.gep’: File exists
 	sed -i -e '/^dist_profiles_DATA/s:=.*:=:' plugins/sjcd/data/Makefile.am || die
 
-	sed -i -e 's:python:python2:' scripts/sync-palm-jppy.py || die
-
-	epatch \
-		"${FILESDIR}"/${P}-gdl-3.6.patch \
-		"${FILESDIR}"/${P}-gold.patch
-	eautoreconf
+	# m4dir for gst-element-check-0.10.m4
+	AT_M4DIR=${WORKDIR} eautoreconf
 }
 
 src_configure() {