Cleanup

(Portage version: 2.2_rc11/cvs/Linux 2.6.25.8 i686)

4 files changed, 6 insertions, 107 deletions

diff --git a/app-cdr/gnomebaker/ChangeLog b/app-cdr/gnomebaker/ChangeLog
index f6113497166a..9c34ab9893e0 100644
--- a/app-cdr/gnomebaker/ChangeLog
+++ b/app-cdr/gnomebaker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/gnomebaker
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.55 2008/08/30 14:40:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.56 2008/09/28 09:23:28 loki_val Exp $
+
+  28 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -files/gnomebaker-0.6.1-export-dynamic_for_glade.patch,
+  -files/gnomebaker-0.6.1-thread_init.patch, -gnomebaker-0.6.1-r2.ebuild:
+  Cleanup
 
   30 Aug 2008; Brent Baude <ranger@gentoo.org> gnomebaker-0.6.4.ebuild:
   Marking gnomebaker-0.6.4 ppc for bug 209877
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.1-export-dynamic_for_glade.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.1-export-dynamic_for_glade.patch
deleted file mode 100644
index 90e75fdc3752..000000000000
--- a/app-cdr/gnomebaker/files/gnomebaker-0.6.1-export-dynamic_for_glade.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur gnomebaker-0.6.0.dist/src/Makefile.am gnomebaker-0.6.0/src/Makefile.am
---- gnomebaker-0.6.0.dist/src/Makefile.am	2006-05-06 00:54:15.000000000 +0200
-+++ gnomebaker-0.6.0/src/Makefile.am	2007-01-22 01:45:33.000000000 +0100
-@@ -36,3 +36,6 @@
- 	cairofillbar.c cairofillbar.h
- 	
- gnomebaker_LDADD =  @GNOMEBAKER_LIBS@
-+
-+gnomebaker_LDFLAGS = -export-dynamic 
-+
-diff -Nur gnomebaker-0.6.0.dist/src/Makefile.in gnomebaker-0.6.0/src/Makefile.in
---- gnomebaker-0.6.0.dist/src/Makefile.in	2006-09-16 01:06:13.000000000 +0200
-+++ gnomebaker-0.6.0/src/Makefile.in	2007-01-22 01:45:33.000000000 +0100
-@@ -249,6 +249,7 @@
- 	cairofillbar.c cairofillbar.h
- 
- gnomebaker_LDADD = @GNOMEBAKER_LIBS@
-+gnomebaker_LDFLAGS = -export-dynamic 
- all: all-am
- 
- .SUFFIXES:
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.1-thread_init.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.1-thread_init.patch
deleted file mode 100644
index 2668bcc54b83..000000000000
--- a/app-cdr/gnomebaker/files/gnomebaker-0.6.1-thread_init.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/main.c	2006-08-31 01:41:15.000000000 +0200
-+++ src/main_fixed.c	2007-05-10 23:22:33.000000000 +0200
-@@ -49,6 +49,9 @@ static GOptionEntry entries[] =
- gint
- main(gint argc, gchar *argv[])
- {
-+    /* This must happen before any other GLib function is called */
-+    if (!g_thread_supported ()) g_thread_init(NULL);
-+
- 	GError *error = NULL;
- 	GOptionContext *context = g_option_context_new(_(" - GNOME CD/DVD burning application"));
- 	/* add main entries */
-@@ -71,12 +74,11 @@ main(gint argc, gchar *argv[])
-     textdomain (GETTEXT_PACKAGE);
- #endif
- 
-+    gdk_threads_init();
-+
- #ifdef GST_010
-     struct poptOption* options = NULL;
- #else
--    if (!g_thread_supported ()) g_thread_init(NULL);
--    gdk_threads_init();
--
- 	struct poptOption options[] =
- 	{
-     	{NULL, '\0', POPT_ARG_INCLUDE_TABLE, NULL, 0, "GStreamer", NULL},
diff --git a/app-cdr/gnomebaker/gnomebaker-0.6.1-r2.ebuild b/app-cdr/gnomebaker/gnomebaker-0.6.1-r2.ebuild
deleted file mode 100644
index 2f304232f631..000000000000
--- a/app-cdr/gnomebaker/gnomebaker-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/gnomebaker-0.6.1-r2.ebuild,v 1.10 2008/05/02 15:00:29 cardoe Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="GnomeBaker is a GTK2/Gnome cd burning application."
-HOMEPAGE="http://gnomebaker.sf.net"
-SRC_URI="mirror://sourceforge/gnomebaker/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dvdr nls mp3 flac vorbis libnotify"
-KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
-RDEPEND="app-cdr/cdrdao
-	virtual/cdrtools
-	>=dev-libs/glib-2.4.0
-	>=dev-libs/libxml2-2.4.0
-	>=gnome-base/libglade-2.4.2
-	>=gnome-base/libgnomeui-2.10
-	>=media-libs/gstreamer-0.10.0
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.8
-	dev-perl/XML-Parser
-	dvdr? ( app-cdr/dvd+rw-tools )
-	flac? ( >=media-plugins/gst-plugins-flac-0.10.0
-		media-libs/gst-plugins-good )
-	libnotify? ( x11-libs/libnotify )
-	mp3? ( >=media-plugins/gst-plugins-mad-0.10.0
-		media-libs/gst-plugins-good	)
-	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10.0
-		>=media-libs/libogg-1.1.2
-		media-libs/gst-plugins-good )"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable libnotify)"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-export-dynamic_for_glade.patch"
-	epatch "${FILESDIR}/${P}-thread_init.patch"
-
-	gnome2_omf_fix
-}
-
-src_install() {
-	gnome2_src_install \
-		gnomebakerdocdir=/usr/share/doc/${P} \
-		docdir=/usr/share/gnome/help/${PN}/C \
-		gnomemenudir=/usr/share/applications
-	rm -rf "${D}"/usr/share/doc/${P}/*.make "${D}"/var
-	use nls || rm -rf "${D}"/usr/share/locale
-}