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

(Portage version: 2.2.0_alpha150/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

5 files changed, 180 insertions, 7 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/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>