app-pda/gtkpod: Version Bump, fixescompilation against anujata-3.6, #448766; add fix for dev-libs/gdl-3.6.2, #448760 and gold

Package-Manager: portage-2.2.0_alpha150/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

6 files changed, 189 insertions, 12 deletions

diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index 3fd854b5e1a6..6213d1eee834 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-pda/gtkpod
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.118 2012/12/06 14:07:36 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.119 2013/01/11 16:09:02 jlec Exp $
+
+*gtkpod-2.1.3 (11 Jan 2013)
+
+  11 Jan 2013; Justin Lecher <jlec@gentoo.org> +gtkpod-2.1.3.ebuild,
+  +files/gtkpod-2.1.3-gdl-3.6.patch, +files/gtkpod-2.1.3-gold.patch,
+  metadata.xml:
+  Version Bump, fixescompilation against anujata-3.6, #448766; add fix for
+  dev-libs/gdl-3.6.2, #448760 and gold
 
   06 Dec 2012; Justin Lecher <jlec@gentoo.org> -gtkpod-2.1.2.ebuild:
   Drop old
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index 729baefb6f05..ec900652cccf 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -2,14 +2,18 @@
 Hash: SHA256
 
 AUX gtkpod-2.1.2-bffr-overflow.patch 820 SHA256 8ddf32cca5e705bb6a752d304c253ceaa04644a212df16ce342b311fc200310f SHA512 0a8587d31f47673952fbfca7441b1c60dfc95e5fb266faa9e7197e9ae46c41d4c7bb928d630cd8b90a5dfd090e4ae6f6eaaca27a0267fdc761501dcd7f081533 WHIRLPOOL 9c952ba7e45aa8f023f919906d46290035441ae089d6ae3f956529647998faabf9980c2cbc267fbc6f084331a6f62d89cce2a095ecc4fb428b8ed1db830b7a3f
+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 gtkpod-2.1.2.tar.gz 3673800 SHA256 c3d054235bae80aa8563a441c902fa32528c2b00ba05a98066671fa3036dc1e6 SHA512 01b5b0c370451c717d7a04b592b2b986a692615d1624a267238268e19dd3baeab2f79604e700573fecce5e3822ee37a1d485965c648e2d7b1cb2ab3602742470 WHIRLPOOL f8b6b4304c07eb3e51b10c15288ba6813b6ea715ffa227fd0909acff5742548a49a2ecc999cabd67c0eca918dc4993339903bce0a8e0767298dd2b5eda48baf7
+DIST gtkpod-2.1.3.tar.gz 3712898 SHA256 2b98352fe670a3d757c2b9cc4f8b910ca7fe8b8d9441764055075cfff16e4691 SHA512 6d59d1a2cce76d89ef7a47244de0edd7965916324c3681cba751316727fd6026c98128948a06db5778d889e582e200d29645e1beeb566ade865631a4c36ba5e5 WHIRLPOOL 02228c644292a2170c3bc11c2bbc6f56d63f5e7e074ddbc2a77c86ce225cbd1bafbedbc38c9e9e8df8569275a1da35b897b4d2e69b04eb55327c66d1a455bfe9
 EBUILD gtkpod-2.1.2-r1.ebuild 2610 SHA256 a493cc04c25bd53e003c1f3742c4a2f1d756cd9fb11ff7dd9ea179c81fc98ec0 SHA512 de5e2714c5cece71b12fbb1db87cf96d415e0f0f235973efdabd98bf51e26cda3555afef3c87c59f459989d3da3326ed55e68818b6f794c0cab4ed229d979dd0 WHIRLPOOL 758f230c6ca0c5ff8dbb7e7ea301ee0d87260100956ed200b2336b6664d5eef543e1f21bd3f7657ac95070a94dbdb02189b0d12f1142d829874054bf0788f2f7
-MISC ChangeLog 15205 SHA256 63722cdbbeb5fa7be49b67b182618d86f5d3023b263a641f3bb753fb05f72efc SHA512 0d43f62e5ec040b4df53129cae850b9393daefa98cea77590b8a607ee33b12d04c18c3b0762e1f6db392c240008ab79faabfb8120c4c6a1e442879e3a344f960 WHIRLPOOL 1641f5582421d390c4f8f259b6fbf2f9a7a73bc2d363365b49d51d8bc52512652dea9ef211d6d8ed64012ad487e57291553cbb6632449d814702e7aab2914ee7
-MISC metadata.xml 321 SHA256 13be2558f865dce045c0f52f0931340d61cee6ed1fa412681a0c8f25999e329f SHA512 16cf83df70f3517a9cfe41eb3cd3287c503eea8d0909aa8bacdecead62dd5075733f6d5808897a96ec47a36a14c129cadf0859ef7f3467b9e06725f1d70d6dfc WHIRLPOOL e8eca08f9c70e1a94c440c912a50d067588984f79a6aa69ab5f7fc23d953c9028e94d55b30dfd57135358b0593af0a39b17801a998840c96f5e7db50e2c09177
+EBUILD gtkpod-2.1.3.ebuild 2612 SHA256 aa35dc7a09b3b69851df29e8a26308313df31b3e5e0d244d71ed9c7bc1a9880f SHA512 873a2be9c72006657e74f330979fbd84119f171ae823dd6a7ad3768bbd838cc5ba9006c60eff546c6ac421a3d636604a403589bc1fada3af992da000ec45cab4 WHIRLPOOL 2f7e9258b728aab725197a927121d4d89a50527e9fe8981510665a8e68c04e1c5ee4e97674a9a764ab14132484c441fa160f6dd8daca56c10cc5f61fdf81b634
+MISC ChangeLog 15503 SHA256 baf372119e03009e2854b8fed0a5bcb79a2880dc8a8470ec4eeb52c0b9a24f41 SHA512 ab9ac793c9e7a3da51907073f4772fba791a14d00093e694410ccd654c2a26015f414f1b8c764a5282e435251d7e8c55088b7b455f441f8521b4d35f54af2cd2 WHIRLPOOL f4fbe82d4c1845efdfca781bc3ddc0be82950ef50a6eadc03316e201e31b9e357247742d46193ef7a9fce6dc750a3311aa14563fdde3235b5d152d13dce03dca
+MISC metadata.xml 328 SHA256 95407831a5060771b1e952c41c4b644539008e700ddfc8fb7d8a1908393ae05a SHA512 75a4085abf4c8c3aed8b137909fdd0c595ea89b30a6b1dbc8a30558020d545f1be0c7e180ea4581e7eab3feca5563d0b1f167226b6becba18369ead910f70a04 WHIRLPOOL 7ceefc929392725906e812ca2673cbf1c45a64a9805f7dc1b76312359c0c81c762ff118619b073bc53acf889867f137454cce51f67f71ae3bc06f1347c4c3973
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDApqgACgkQgAnW8HDreRZ9DACeI+ulLe7r7w9Fx2/LTYXqEhJ6
-BZwAn1vy3j/4YGFtMGeMRjyBQEgluEcq
-=qg61
+iEYEAREIAAYFAlDwOR8ACgkQgAnW8HDreRYQzACg0oswv/NOsgEpcUdtGTQCEOwZ
+AlUAnAiz/Y7T648LRGfNlxQsJDyAXUNV
+=XUqJ
 -----END PGP SIGNATURE-----
diff --git a/app-pda/gtkpod/files/gtkpod-2.1.3-gdl-3.6.patch b/app-pda/gtkpod/files/gtkpod-2.1.3-gdl-3.6.patch
new file mode 100644
index 000000000000..b794fa11b7bf
--- /dev/null
+++ b/app-pda/gtkpod/files/gtkpod-2.1.3-gdl-3.6.patch
@@ -0,0 +1,44 @@
+Index: gtkpod-2.1.2/src/anjuta-action-callbacks.c
+===================================================================
+--- gtkpod-2.1.2.orig/src/anjuta-action-callbacks.c
++++ gtkpod-2.1.2/src/anjuta-action-callbacks.c
+@@ -65,7 +65,7 @@ void
+ on_layout_lock_toggle (GtkAction *action, AnjutaApp *app)
+ {
+ 	if (app->layout_manager)
+-		g_object_set (app->layout_manager->master, "locked",
++		g_object_set (gdl_dock_layout_get_master (app->layout_manager), "locked",
+ 					  gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)),
+ 					  NULL);
+ }
+Index: gtkpod-2.1.2/src/anjuta-app.c
+===================================================================
+--- gtkpod-2.1.2.orig/src/anjuta-app.c
++++ gtkpod-2.1.2/src/anjuta-app.c
+@@ -252,7 +252,7 @@ static void on_gdl_style_changed(GSettin
+     else if (g_strcmp0(pr_style, "Tabs") == 0)
+         style = GDL_SWITCHER_STYLE_TABS;
+ 
+-    g_object_set(G_OBJECT(app->layout_manager->master), "switcher-style", style, NULL);
++    g_object_set(G_OBJECT(gdl_dock_layout_get_master (app->layout_manager)), "switcher-style", style, NULL);
+     g_free(pr_style);
+ }
+ 
+@@ -478,14 +478,14 @@ static void anjuta_app_instance_init(Anj
+     gtk_widget_show(app->dock);
+     gtk_box_pack_end(GTK_BOX (hbox), app->dock, TRUE, TRUE, 0);
+ 
+-    dockbar = gdl_dock_bar_new(GDL_DOCK(app->dock));
++    dockbar = gdl_dock_bar_new(G_OBJECT(app->dock));
+     gtk_widget_show(dockbar);
+     gtk_box_pack_start(GTK_BOX (hbox), dockbar, FALSE, FALSE, 0);
+ 
+-    app->layout_manager = gdl_dock_layout_new(GDL_DOCK (app->dock));
++    app->layout_manager = gdl_dock_layout_new(G_OBJECT (app->dock));
+     g_signal_connect (app->layout_manager, "notify::dirty",
+             G_CALLBACK (on_layout_dirty_notify), app);
+-    g_signal_connect (app->layout_manager->master, "notify::locked",
++    g_signal_connect (gdl_dock_layout_get_master (app->layout_manager), "notify::locked",
+             G_CALLBACK (on_layout_locked_notify), app);
+ 
+     /* UI engine */
diff --git a/app-pda/gtkpod/files/gtkpod-2.1.3-gold.patch b/app-pda/gtkpod/files/gtkpod-2.1.3-gold.patch
new file mode 100644
index 000000000000..93c9f72a3747
--- /dev/null
+++ b/app-pda/gtkpod/files/gtkpod-2.1.3-gold.patch
@@ -0,0 +1,15 @@
+ libgtkpod/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libgtkpod/Makefile.am b/libgtkpod/Makefile.am
+index 464741f..c69dac8 100644
+--- a/libgtkpod/Makefile.am
++++ b/libgtkpod/Makefile.am
+@@ -50,6 +50,7 @@ AM_CFLAGS = \
+ libgtkpod_la_LDFLAGS = $(LIBGTKPOD_LDFLAGS) -version-info $(LIBGTKPOD_SO_VERSION) -no-undefined
+ libgtkpod_la_LIBADD = \
+ 	$(LIBGTKPOD_LIBS) \
++	-lm \
+ 	@LIBOBJS@
+ 	
+ libgtkpodincludebase = $(includedir)/gtkpod
diff --git a/app-pda/gtkpod/gtkpod-2.1.3.ebuild b/app-pda/gtkpod/gtkpod-2.1.3.ebuild
new file mode 100644
index 000000000000..340b365b98f3
--- /dev/null
+++ b/app-pda/gtkpod/gtkpod-2.1.3.ebuild
@@ -0,0 +1,106 @@
+# 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.ebuild,v 1.1 2013/01/11 16:09:02 jlec Exp $
+
+EAPI=4
+
+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"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac clutter curl cdr flac gstreamer mp3 vorbis webkit"
+
+COMMON_DEPEND="
+	dev-libs/gdl:3
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	dev-util/anjuta
+	media-libs/libgpod
+	media-libs/libid3tag
+	x11-libs/gtk+:3
+	aac? ( media-libs/faad2 )
+	clutter? ( media-libs/clutter-gtk:1.0 )
+	curl? ( net-misc/curl )
+	cdr? (
+		>=app-cdr/brasero-3
+		media-libs/musicbrainz:3
+		)
+	flac? ( media-libs/flac )
+	gstreamer? ( media-libs/gst-plugins-base:0.10 )
+	mp3? ( media-sound/lame )
+	vorbis? (
+		media-libs/libvorbis
+		media-sound/vorbis-tools
+		)
+	webkit? ( net-libs/webkit-gtk:3 )"
+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"
+
+src_prepare() {
+	# Make sure SLOT="4" is not used. Everyone should move from "3" to "5" directly.
+	sed -i -e '/PKG_CONFIG/s:libmusicbrainz4:&sLoT4iSdEpReCaTeD:' 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
+}
+
+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
+}
diff --git a/app-pda/gtkpod/metadata.xml b/app-pda/gtkpod/metadata.xml
index f7753995fa99..024fb36024ad 100644
--- a/app-pda/gtkpod/metadata.xml
+++ b/app-pda/gtkpod/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>pda</herd>
-	<use>
-		<flag name="clutter">Enable clutter support for displaying coverart</flag>
-		<flag name="webkit">Enable webkit support for finding coverart</flag>
-	</use>
+  <herd>pda</herd>
+  <use>
+    <flag name="clutter">Enable clutter support for displaying coverart</flag>
+    <flag name="webkit">Enable webkit support for finding coverart</flag>
+  </use>
 </pkgmetadata>