old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

4 files changed, 6 insertions, 283 deletions

diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index 03f36822549a..9ec692d0526f 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/gtkpod
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.130 2014/04/01 11:25:11 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.131 2014/07/26 12:20:25 ssuominen Exp $
+
+  26 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/gtkpod-2.1.3-gdl-3.6.patch, -gtkpod-2.1.3-r1.ebuild,
+  -gtkpod-2.1.4_pre20130428.ebuild:
+  old
 
   01 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> gtkpod-2.1.4.ebuild:
   x86 stable wrt bug #500240
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
deleted file mode 100644
index b794fa11b7bf..000000000000
--- a/app-pda/gtkpod/files/gtkpod-2.1.3-gdl-3.6.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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/gtkpod-2.1.3-r1.ebuild b/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild
deleted file mode 100644
index df62ca8661bd..000000000000
--- a/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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.6 2013/05/01 19:09:18 ssuominen Exp $
-
-EAPI=5
-
-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
-	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 )"
-
-src_prepare() {
-	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
-
-	# 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
-}
diff --git a/app-pda/gtkpod/gtkpod-2.1.4_pre20130428.ebuild b/app-pda/gtkpod/gtkpod-2.1.4_pre20130428.ebuild
deleted file mode 100644
index 0082298fd6a0..000000000000
--- a/app-pda/gtkpod/gtkpod-2.1.4_pre20130428.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# 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
-}