Use upstream git 8f833a3 snapshot dated 20130428 for multiple upstream fixes, including a fix for the "Track filter" wrt #466240 by David De Sousa

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

3 files changed, 138 insertions, 9 deletions

diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index b9efb4ed6b2d..91b68cd4c4e6 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,13 @@
 # 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.126 2013/05/01 19:09:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.127 2013/05/01 19:22:48 ssuominen Exp $
+
+*gtkpod-2.1.4_pre20130428 (01 May 2013)
+
+  01 May 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +gtkpod-2.1.4_pre20130428.ebuild:
+  Use upstream git 8f833a3 snapshot dated 20130428 for multiple upstream fixes,
+  including a fix for the "Track filter" wrt #466240 by David De Sousa
 
   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
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index daa3415b3a5c..92ede203b544 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -5,17 +5,19 @@ AUX gtkpod-2.1.3-gdl-3.6.patch 1974 SHA256 98d71417880497d0e01f415656a343d08f952
 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
+DIST gtkpod-2.1.4~8f833a3.tar.gz 3714942 SHA256 1a3852aaecdc18ea88ff03a12b60a2a0a2673dec5b5feb6aae15c94a0e1e0a14 SHA512 7910213266aca8c733fccf6d360d09d215e15852b658ee32f5f6179ac42e70177f42419791b6c3810bff390eafbc48f218224e4d5e2cc1c3762b777abbe2d612 WHIRLPOOL 7c874aeec86a361fdb21afe14cfa26de4b1dd3d98cee33d892a628ab274b563f91e6a4458cf3e4f616d2d8f0db4e9997e49fba0e824d244e48ef6b3bcbecd802
 EBUILD gtkpod-2.1.3-r1.ebuild 3237 SHA256 a173469bdc3b47bcf2dc1e50668cea3720f4e7bf19809a157e5deaecdda04b51 SHA512 97980ee40f6f5057d378a7a0673aaf6a3b688bd0cec42699bc67613cdbbb2bb6a95ae8b8339ccfee0f8bc6d894b6292b1492613e1d044b0867f8752ebe556f8a WHIRLPOOL 3bfa3a8384a3b878e42eb01a4b6870fbd4235cd2b14a475117abd8bce74cda5f1a29a6443d2991de1dba1d9b687b1d68607dda84e35797df593be203254c7c87
-MISC ChangeLog 17095 SHA256 cc757300888ae2e44f9640f714c8a63ce0ca78c53103dbe5cf11cd51afaf954a SHA512 25471fcc0605c990783ca2cc81196d5eb07cba0392feef3d7bc850462363cb59542ab6651087854a4b9fc978081f96b747b49c3f17abe20ca49014bbeb3ad8c5 WHIRLPOOL efc48ce59b6bfff9faad248c451ab9e8a2703bd4020ab80fb1432fca8bf8be3c6f392050048623c3bf6e4c892a10a715b351f665d394189b42c519a1866046a2
+EBUILD gtkpod-2.1.4_pre20130428.ebuild 3265 SHA256 f38408a5d9da3e07e1d607b21381c570bbbb627b9c957e7f0ce9e7655ce0e900 SHA512 31d55541636caf0fa151d30d08a6e381183d2a98962138d4f8091f48b4578c6e8e6bf592a63569f34e2012715919133ab72bd5a0388c7415a88c1a17713860cc WHIRLPOOL 609ac00801b937659246efa5656b4ec7d9f07f8dd4d4ca50489a74227dea6358e2a575dc21914d1866459255dc54912ae3787ec2d1851824709b653df4de2f58
+MISC ChangeLog 17378 SHA256 234c76e9ad6700b9af660fcdde87857f0c4171538cce1892647551f2eef48c0c SHA512 2f5717b10a63807cd80d0d2e08f4c8f21edde09454f0cfe6b1e341b89973cb9b3e271554695ea6a763a36cbcb8981041ddfd27796f6520973b56e359bc0c9e8f WHIRLPOOL 7ac17ef488637601e51019c287941db42021bff9662e8fda79d2e1db67ca235e9e60b69f1d5a2b0da2b3e74082e0c43072b599481d8178b3ab136aa04cf500c5
 MISC metadata.xml 328 SHA256 95407831a5060771b1e952c41c4b644539008e700ddfc8fb7d8a1908393ae05a SHA512 75a4085abf4c8c3aed8b137909fdd0c595ea89b30a6b1dbc8a30558020d545f1be0c7e180ea4581e7eab3feca5563d0b1f167226b6becba18369ead910f70a04 WHIRLPOOL 7ceefc929392725906e812ca2673cbf1c45a64a9805f7dc1b76312359c0c81c762ff118619b073bc53acf889867f137454cce51f67f71ae3bc06f1347c4c3973
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRgWfvAAoJEEdUh39IaPFNeHAIAIZQoogGFg4LFfq1nOnnoJqZ
-xoimb9mSnigXR8DP4C8E4Kc1ADnk2dmi1AqD8E+OqgBPL2zs8wvt4P71GXgOdJE0
-x2l7Gb2LzsAr7xT1hjFyUknWOFxc67CHts4LtcOKP4sGY+kQ60DgQqE2Vg49OHZB
-v6zSx5s725QRyaNToSP+GxjzWXxCOpXT3jBkiwFvt+yEPp0PFakWb5y9n8bM3ucO
-46XrdHk+zZnNAHIpqcRKpNToyOGUhr1rvg9WyFH0AOeAvmRykngbfGcgm91ZvvpS
-vELrY2dbq7CpixSXWF7aeHe9OKbRY8o8NWT9S9rz9UFTmbPfA3rg0SSiq0S2UDA=
-=TUnC
+iQEcBAEBCAAGBQJRgWsZAAoJEEdUh39IaPFNPYIH/iS2D3eaqCuhf89ODZSXduB9
+XqsSrtPFoSrQCjxH5SYZxP5ksrWz4Ke9Wanvj09Ejrw/CYf4FX5HquZ/iidCi+AP
+31n5pTCGR+oPRflkH5Z7bLXIIQytAsrD4YURAMC1aOYU4rE+tbFILpcmrgins8eH
+HMhE6o/KcpOTyZZz7N75uK8qAe3Q9pVqijXFdfvm72eAo/YfifR9nY+S7prVv0mA
+nuSDAXMnigt7Li1XK4DwyQgd77493AwguFopHtmxoKOyK6EP928awL0CJgNijVrc
+HGjXqge//B25gqxGwctBSsLQIJTxcCtfJhvJxDSXRqt/jYpVfhD9CyKgaGMoZAM=
+=FWME
 -----END PGP SIGNATURE-----
diff --git a/app-pda/gtkpod/gtkpod-2.1.4_pre20130428.ebuild b/app-pda/gtkpod/gtkpod-2.1.4_pre20130428.ebuild
new file mode 100644
index 000000000000..0082298fd6a0
--- /dev/null
+++ b/app-pda/gtkpod/gtkpod-2.1.4_pre20130428.ebuild
@@ -0,0 +1,120 @@
+# 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.4_pre20130428.ebuild,v 1.1 2013/05/01 19:22:48 ssuominen Exp $
+
+EAPI=5
+
+inherit autotools eutils gnome2-utils
+
+MY_P=${P/_pre*/~8f833a3}
+
+DESCRIPTION="A graphical user interface to the Apple productline"
+HOMEPAGE="http://gtkpod.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_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.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 )
+	flac? ( media-libs/flac )
+	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
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/os-headers
+	virtual/pkgconfig"
+REQUIRED_USE="cdr? ( gstreamer )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1.3-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
+
+	# m4dir for gst-element-check-0.10.m4
+	AT_M4DIR=${WORKDIR} eautoreconf
+}
+
+src_configure() {
+	export GST_INSPECT=true #420279
+
+	econf \
+		--disable-static \
+		$(use_enable webkit plugin-coverweb) \
+		$(use_enable clutter plugin-clarity) \
+		$(use_enable gstreamer plugin-media-player) \
+		$(use_enable cdr plugin-sjcd) \
+		$(use_with curl) \
+		$(use_with vorbis ogg) \
+		$(use_with flac) \
+		$(use_with aac mp4)
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF}/html \
+		figuresdir=/usr/share/doc/${PF}/html/figures \
+		install
+
+	prune_libtool_files --all
+
+	dodoc AUTHORS ChangeLog NEWS README TODO TROUBLESHOOTING
+	rm -f "${ED}"/usr/share/gtkpod/data/{AUTHORS,COPYING} || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}