Move gob to DEPEND, bug #220049. Cleaning up old releases.

(Portage version: 2.1.5_rc6)

8 files changed, 14 insertions, 321 deletions

diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog
index 72cb770e5cc1..4e5470a23eb1 100644
--- a/net-wireless/gnome-bluetooth/ChangeLog
+++ b/net-wireless/gnome-bluetooth/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/gnome-bluetooth
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.47 2008/04/17 19:32:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.48 2008/05/05 22:42:03 eva Exp $
+
+  06 May 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gnome-bluetooth-0.7.0-aclocal_openobex.patch,
+  -files/gnome-bluetooth-0.7.0-as-needed.patch,
+  -files/gnome-bluetooth-0.8.0-G_DEPRECATED.patch,
+  -gnome-bluetooth-0.7.0-r1.ebuild, -gnome-bluetooth-0.8.0.ebuild,
+  gnome-bluetooth-0.9.1.ebuild, gnome-bluetooth-0.11.0.ebuild:
+  Move gob to DEPEND, bug #220049. Cleaning up old releases.
 
   17 Apr 2008; Jeroen Roovers <jer@gentoo.org>
   gnome-bluetooth-0.11.0.ebuild:
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.7.0-aclocal_openobex.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.7.0-aclocal_openobex.patch
deleted file mode 100644
index b57188f99b27..000000000000
--- a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.7.0-aclocal_openobex.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -Nru gnome-bluetooth-0.7.0.orig/aclocal.m4 gnome-bluetooth-0.7.0/aclocal.m4
---- gnome-bluetooth-0.7.0.orig/aclocal.m4	2005-11-22 00:23:15.000000000 +0200
-+++ gnome-bluetooth-0.7.0/aclocal.m4	2006-04-22 12:38:30.860704000 +0300
-@@ -6860,64 +6860,6 @@
- AC_MSG_RESULT([$SED])
- ])
- 
--dnl Check for openobex library
--dnl Written by Pontus Fuchs 2000-08-18
--dnl Version checking fixed by Christian W. Zuckschwerdt 2002-10-17
--
--AC_DEFUN([AM_PATH_OPENOBEX], [
--	AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no)
--
--	if test "$OPENOBEX_CONFIG" = "no" ; then
--		AC_MSG_ERROR(openobex-config not found. Pehaps openobex is not installed.)
--	fi
--
--	min_obex_version=ifelse([$1], ,0.9.6,$1)
--	AC_MSG_CHECKING(for openobex - version >= $min_obex_version)
--
--	OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags`
--	OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs`
--
--	obex_config_version=`$OPENOBEX_CONFIG --version`
--
--	obex_config_major_version=`$OPENOBEX_CONFIG --version | \
--		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
--	obex_config_minor_version=`$OPENOBEX_CONFIG --version | \
--		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
--	obex_config_micro_version=`$OPENOBEX_CONFIG --version | \
--		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
--
--	obex_req_major_version=`echo $min_obex_version | \
--		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
--	obex_req_minor_version=`echo $min_obex_version | \
--		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
--	obex_req_micro_version=`echo $min_obex_version | \
--		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
--
--
--	if test $obex_req_major_version -lt $obex_config_major_version ; then
--       		obex_config_version_ok="yes"
--       	fi
--	if test $obex_req_major_version -eq $obex_config_major_version ; then
--		if test $obex_req_minor_version -lt $obex_config_minor_version ; then
--       			obex_config_version_ok="yes"
--	       	fi
--		if test $obex_req_minor_version -eq $obex_config_minor_version ; then
--			if test $obex_req_micro_version -le $obex_config_micro_version ; then
--				obex_config_version_ok="yes"
--			fi
--		fi
--	fi
--	
--	if test "$obex_config_version_ok" != "yes" ; then
--		AC_MSG_ERROR(Installed openobex library too old ($obex_config_version))
--	fi
--
--	AC_SUBST(OPENOBEX_CFLAGS)
--	AC_SUBST(OPENOBEX_LIBS)
--	AC_MSG_RESULT(yes)
--])
--
--
- dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
- dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
- dnl also defines GSTUFF_PKG_ERRORS on error
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.7.0-as-needed.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.7.0-as-needed.patch
deleted file mode 100644
index 30af537f43e6..000000000000
--- a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.7.0-as-needed.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: gnome-bluetooth-0.7.0/src/Makefile.am
-===================================================================
---- gnome-bluetooth-0.7.0.orig/src/Makefile.am
-+++ gnome-bluetooth-0.7.0/src/Makefile.am
-@@ -33,41 +33,42 @@ gnomebt-chooser.lo: gnomebt-controller.h
- 
- libgnomebt_la_LDFLAGS = \
- 	-version-info $(GNOMEBT_LT_VERSION)
-+libgnomebt_la_LIBADD = $(GNOME_BLUETOOTH_LIBS)
- 
- gnomebt_chooser_test_SOURCES = \
- 	gnomebt-chooser-test.c
- 
- gnomebt_chooser_test_LDADD = \
--	$(GNOME_BLUETOOTH_LIBS) libgnomebt.la
-+	libgnomebt.la $(GNOME_BLUETOOTH_LIBS)
- 
- gnomebt_controller_test_SOURCES = \
- 	gnomebt-controller-test.c
- 
- gnomebt_controller_test_LDADD = \
--	$(GNOME_BLUETOOTH_LIBS) libgnomebt.la
-+	libgnomebt.la $(GNOME_BLUETOOTH_LIBS)
- 
- gnomebt_fileactiondialog_test_SOURCES = \
- 	gnomebt-fileactiondialog-test.c
- 
- gnomebt_fileactiondialog_test_LDADD = \
--	$(GNOME_BLUETOOTH_LIBS) libgnomebt.la
-+	libgnomebt.la $(GNOME_BLUETOOTH_LIBS)
- 
- gnomebt_permissiondialog_test_SOURCES = \
- 	gnomebt-permissiondialog-test.c
- 
- gnomebt_permissiondialog_test_LDADD = \
--	$(GNOME_BLUETOOTH_LIBS) libgnomebt.la
-+	libgnomebt.la $(GNOME_BLUETOOTH_LIBS)
- 
- spinner_test_SOURCES = \
- 	spinner-test.c
- 
- spinner_test_LDADD = \
--	$(GNOME_BLUETOOTH_LIBS) libgnomebt.la
-+	libgnomebt.la $(GNOME_BLUETOOTH_LIBS)
- 
- gconftest_SOURCES = \
- 	gconftest.c
- 
--gconftest_LDFLAGS = \
-+gconftest_LDADD = \
- 	$(GNOME_BLUETOOTH_LIBS) $(BLUETOOTH_LIBS)
- 
- GOB_DIST = \
-@@ -121,13 +122,13 @@ gnomebt-chooser-py.c: gnomebt-chooser.de
- pydir = @pythondir@/gnomebt/
- 
- controller_la_SOURCES = gnomebt-controller-py.c gnomebt-controller-pymodule.c
--controller_la_LIBADD =  libgnomebt.la
--controller_la_LDFLAGS = $(GNOME_BLUETOOTH_PYTHON_LIBS) \
--			$(GNOME_BLUETOOTH_LIBS) \
--			-module -avoid-version
-+controller_la_LIBADD =  libgnomebt.la \
-+			$(GNOME_BLUETOOTH_PYTHON_LIBS) \
-+			$(GNOME_BLUETOOTH_LIBS)
-+controller_la_LDFLAGS =	-module -avoid-version
- 
- chooser_la_SOURCES = gnomebt-chooser-py.c gnomebt-chooser-pymodule.c
--chooser_la_LIBADD =  libgnomebt.la
--chooser_la_LDFLAGS = 	$(GNOME_BLUETOOTH_PYTHON_LIBS) \
--			$(GNOME_BLUETOOTH_LIBS) \
--			-module -avoid-version
-+chooser_la_LIBADD =  libgnomebt.la \
-+			$(GNOME_BLUETOOTH_PYTHON_LIBS) \
-+			$(GNOME_BLUETOOTH_LIBS)
-+chooser_la_LDFLAGS = -module -avoid-version
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.8.0-G_DEPRECATED.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.8.0-G_DEPRECATED.patch
deleted file mode 100644
index edcc42bc7c61..000000000000
--- a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.8.0-G_DEPRECATED.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naur gnome-bluetooth-0.8.0.orig/libegg/libegg/iconlist/Makefile.am gnome-bluetooth-0.8.0/libegg/libegg/iconlist/Makefile.am
---- gnome-bluetooth-0.8.0.orig/libegg/libegg/iconlist/Makefile.am	2003-09-26 15:38:39.000000000 +0200
-+++ gnome-bluetooth-0.8.0/libegg/libegg/iconlist/Makefile.am	2007-09-27 23:30:53.000000000 +0200
-@@ -2,11 +2,7 @@
- INCLUDES = \
-   $(EGG_CFLAGS) \
-   -I$(top_srcdir)/libegg/util \
--  -DEGG_COMPILATION \
--  -DGTK_DISABLE_DEPRECATED \
--  -DGDK_DISABLE_DEPRECATED \
--  -DG_DISABLE_DEPRECATED
--
-+  -DEGG_COMPILATION
- 
- noinst_LTLIBRARIES = libeggiconlist.la
- 
-diff -Naur gnome-bluetooth-0.8.0.orig/libegg/libegg/Makefile.am gnome-bluetooth-0.8.0/libegg/libegg/Makefile.am
---- gnome-bluetooth-0.8.0.orig/libegg/libegg/Makefile.am	2003-09-26 15:38:38.000000000 +0200
-+++ gnome-bluetooth-0.8.0/libegg/libegg/Makefile.am	2007-09-27 23:30:31.000000000 +0200
-@@ -3,10 +3,7 @@
- 
- INCLUDES = \
-   $(EGG_CFLAGS)  \
--  -DEGG_COMPILATION  \
--  -DGTK_DISABLE_DEPRECATED \
--  -DGDK_DISABLE_DEPRECATED \
--  -DG_DISABLE_DEPRECATED
-+  -DEGG_COMPILATION
- 
- ##noinst_LTLIBRARIES = libegg.la
- 
-diff -Naur gnome-bluetooth-0.8.0.orig/libegg/libegg/tray/Makefile.am gnome-bluetooth-0.8.0/libegg/libegg/tray/Makefile.am
---- gnome-bluetooth-0.8.0.orig/libegg/libegg/tray/Makefile.am	2003-09-26 15:38:41.000000000 +0200
-+++ gnome-bluetooth-0.8.0/libegg/libegg/tray/Makefile.am	2007-09-27 23:29:31.000000000 +0200
-@@ -2,11 +2,7 @@
- INCLUDES = \
-   $(EGG_TRAY_CFLAGS) \
-   -I$(top_srcdir)/libegg/util \
--  -DEGG_COMPILATION \
--  -DGTK_DISABLE_DEPRECATED \
--  -DGDK_DISABLE_DEPRECATED \
--  -DG_DISABLE_DEPRECATED
--
-+  -DEGG_COMPILATION
- 
- noinst_LTLIBRARIES = libeggtray.la
- 
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.11.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-0.11.0.ebuild
index 37b197e71d39..4050d4ee85f8 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.11.0.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-0.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-0.11.0.ebuild,v 1.2 2008/04/17 19:32:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-0.11.0.ebuild,v 1.3 2008/05/05 22:42:03 eva Exp $
 
 inherit distutils gnome2 eutils multilib autotools
 
@@ -21,7 +21,6 @@ RDEPEND=">=gnome-base/libgnomeui-2
 	>=gnome-base/libbonoboui-2
 	>=gnome-base/gconf-2
 	>=gnome-base/orbit-2
-	>=dev-util/gob-2
 	>=dev-libs/openobex-1.2
 	>=net-wireless/bluez-libs-2.25
 	>=net-wireless/libbtctl-0.9
@@ -29,6 +28,7 @@ RDEPEND=">=gnome-base/libgnomeui-2
 	>=dev-python/gnome-python-2.6"
 
 DEPEND="${RDEPEND}
+	>=dev-util/gob-2
 	>=dev-util/intltool-0.35
 	dev-util/pkgconfig"
 
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.7.0-r1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-0.7.0-r1.ebuild
deleted file mode 100644
index a3f99b3fa874..000000000000
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-0.7.0-r1.ebuild,v 1.7 2007/08/01 00:01:03 angelos Exp $
-
-inherit distutils gnome2 eutils multilib autotools
-
-DESCRIPTION="Gnome2 Bluetooth integration suite."
-HOMEPAGE="http://usefulinc.com/software/gnome-bluetooth/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-vfs-2.1.3
-	>=x11-libs/gtk+-2
-	>=gnome-base/librsvg-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/gconf-2
-	>=gnome-base/orbit-2
-	>=dev-util/gob-2
-	>=dev-libs/openobex-1
-	>=net-wireless/bluez-libs-2.25
-	>=net-wireless/libbtctl-0.6.0-r1
-	>=dev-python/pygtk-2.6
-	>=dev-python/gnome-python-2.6"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-DOCS="README NEWS AUTHORS COPYING ChangeLog"
-MAKEOPTS="${MAKEOPTS} -j1"
-PYTHON_MODNAME="gnomebt"
-USE_DESTDIR=1
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's:${libdir:/${platlibdir:' acinclude.m4
-	sed -i -e 's:blueradio-48.png:blueradio.png:' python/manager.py
-	epatch "${FILESDIR}/${P}-aclocal_openobex.patch"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	eautoreconf
-}
-
-src_compile() {
-	platlibdir=$(get_libdir) gnome2_src_compile
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	gnome2_pkg_postrm
-}
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.8.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-0.8.0.ebuild
deleted file mode 100644
index efc42af9f411..000000000000
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.8.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-0.8.0.ebuild,v 1.2 2007/09/27 22:45:41 philantrop Exp $
-
-inherit distutils gnome2 eutils multilib autotools
-
-DESCRIPTION="Gnome2 Bluetooth integration suite"
-HOMEPAGE="http://live.gnome.org/GnomeBluetooth"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-vfs-2.1.3
-	>=x11-libs/gtk+-2
-	>=gnome-base/librsvg-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/gconf-2
-	>=gnome-base/orbit-2
-	>=dev-util/gob-2
-	>=dev-libs/openobex-1.2
-	>=net-wireless/bluez-libs-2.25
-	>=net-wireless/libbtctl-0.8.1
-	>=dev-python/pygtk-2.6
-	>=dev-python/gnome-python-2.6"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-DOCS="README NEWS AUTHORS COPYING ChangeLog"
-MAKEOPTS="${MAKEOPTS} -j1"
-PYTHON_MODNAME="gnomebt"
-USE_DESTDIR=1
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-G_DEPRECATED.patch"
-	sed -i -e 's:${libdir:/${platlibdir:' acinclude.m4
-	eautoreconf
-}
-
-src_compile() {
-	platlibdir=$(get_libdir) gnome2_src_compile
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	gnome2_pkg_postrm
-}
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.9.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-0.9.1.ebuild
index e6f6a65d9b13..ef16f849e2a1 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.9.1.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-0.9.1.ebuild,v 1.9 2007/11/17 13:21:10 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-0.9.1.ebuild,v 1.10 2008/05/05 22:42:03 eva Exp $
 
 inherit distutils gnome2 eutils multilib autotools
 
@@ -21,7 +21,6 @@ RDEPEND=">=gnome-base/libgnomeui-2
 	>=gnome-base/libbonoboui-2
 	>=gnome-base/gconf-2
 	>=gnome-base/orbit-2
-	>=dev-util/gob-2
 	>=dev-libs/openobex-1.2
 	>=net-wireless/bluez-libs-2.25
 	>=net-wireless/libbtctl-0.9
@@ -29,6 +28,7 @@ RDEPEND=">=gnome-base/libgnomeui-2
 	>=dev-python/gnome-python-2.6"
 
 DEPEND="${RDEPEND}
+	>=dev-util/gob-2
 	>=dev-util/intltool-0.35
 	dev-util/pkgconfig"