Ebuild cleanup by scarabeus, remove some old versions

(Portage version: 2.2_rc23/cvs/Linux x86_64)

4 files changed, 37 insertions, 322 deletions

diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog
index 35dc162bb437..adcc3b80d045 100644
--- a/x11-misc/google-gadgets/ChangeLog
+++ b/x11-misc/google-gadgets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/google-gadgets
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.21 2009/02/05 03:03:32 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.22 2009/02/16 13:26:57 voyageur Exp $
+
+  16 Feb 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  -google-gadgets-0.10.0-r2.ebuild, -google-gadgets-0.10.2-r2.ebuild,
+  google-gadgets-0.10.5.ebuild:
+  Ebuild cleanup by scarabeus, remove some old versions
 
   05 Feb 2009; Brent Baude <ranger@gentoo.org> google-gadgets-0.10.5.ebuild:
   marking google-gadgets-0.10.5 ~ppc for kde tree bustification/repair
diff --git a/x11-misc/google-gadgets/google-gadgets-0.10.0-r2.ebuild b/x11-misc/google-gadgets/google-gadgets-0.10.0-r2.ebuild
deleted file mode 100644
index e715d91dcb26..000000000000
--- a/x11-misc/google-gadgets/google-gadgets-0.10.0-r2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.10.0-r2.ebuild,v 1.2 2008/08/24 16:22:19 loki_val Exp $
-
-EAPI=1
-
-inherit autotools base eutils fdo-mime
-
-MY_PN=${PN}-for-linux
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Cool gadgets from Google for your Desktop"
-HOMEPAGE="http://code.google.com/p/google-gadgets-for-linux/"
-SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+dbus debug +gtk +qt4 +gstreamer"
-
-# Weird things happen when we start mix-n-matching, so for the time being
-# I've just locked the deps to the versions I have.
-RDEPEND=">=dev-lang/spidermonkey-1.7.0
-	x11-libs/libX11
-	x11-libs/libXext
-	>=dev-libs/libxml2-2.6.32
-	>=sys-libs/zlib-1.2.3-r1
-
-	dbus? ( sys-apps/dbus )
-
-	gstreamer? (	>=media-libs/gstreamer-0.10.19
-			>=media-libs/gst-plugins-base-0.10.19 )
-
-	gtk? (	dbus? ( >=dev-libs/dbus-glib-0.74 )
-		>=x11-libs/cairo-1.6.4
-		>=x11-libs/gtk+-2.12.10
-		>=x11-libs/pango-1.20.3
-		gnome-base/librsvg
-		>=net-libs/xulrunner-1.8.1.14
-		>=net-misc/curl-7.18.1
-		>=dev-libs/atk-1.22.0 )
-
-	qt4? (	dbus? ( >=x11-libs/qt-dbus-4.4.0 )
-		>=x11-libs/qt-core-4.4.0
-		>=x11-libs/qt-webkit-4.4.0
-		>=x11-libs/qt-xmlpatterns-4.4.0
-		>=x11-libs/qt-opengl-4.4.0
-		>=x11-libs/qt-script-4.4.0 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.20"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-xulrunner-1.9.patch" )
-
-pkg_setup() {
-
-	# If a non-google, non-qt4 and non-gtk host system for google-gadgets is ever developed,
-	# I'll consider changing the error below.
-	if ! use gtk && ! use qt4
-	then
-		eerror "You must choose which toolkit to build for. Either qt4 or gtk can be"
-		eerror "chosen. For qt4, see also above. To enable $toolkit, do:"
-		eerror "echo \"${CATEGORY}/${PN} \$toolkit\" >> /etc/portage/package.use"
-		die "You need to choose a toolkit"
-	fi
-
-	if ! use gstreamer
-	then
-		ewarn "Disabling gstreamer disables the  multimedia functions of ${PN}."
-		ewarn "This is not recommended. To enable gstreamer, do:"
-		ewarn "echo \"${CATEGORY}/${PN} gstreamer\" >> /etc/portage/package.use"
-	fi
-
-	if use gtk
-	then
-		if built_with_use net-misc/curl ssl
-		then
-			if built_with_use net-misc/curl nss || built_with_use net-misc/curl gnutls
-			then
-				curl_die
-			else
-				einfo "Congratulations! Your net-misc/curl is configured correctly to run"
-				einfo "${PN}. Not many can say that."
-			fi
-		else
-			curl_die
-		fi
-	fi
-}
-
-src_unpack() {
-	base_src_unpack
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	#For the time being, the smjs-script runtime is required for both gtk and qt
-	#versions, but the goal is to make the qt4 version depend only on qt-script.
-	econf	--disable-dependency-tracking \
-		--disable-update-desktop-database \
-		--disable-update-mime-database \
-		--disable-werror \
-		--enable-libxml2-xml-parser \
-		--enable-smjs-script-runtime \
-		$(use_enable debug) \
-		$(use_enable dbus libggadget-dbus) \
-		$(use_enable gstreamer gst-audio-framework) \
-		$(use_enable gstreamer gst-mediaplayer-element) \
-		$(use_enable gtk gtk-host) \
-		$(use_enable gtk libggadget-gtk ) \
-		$(use_enable gtk gtkmoz-browser-element) \
-		$(use_enable gtk gtk-system-framework) \
-		$(use_enable gtk curl_xml_http_request) \
-		$(use_enable qt4 qt-host) \
-		$(use_enable qt4 libggadget-qt) \
-		$(use_enable qt4 qt-system-framework) \
-		$(use_enable qt4 qtwebkit-browser-element) \
-		$(use_enable qt4 qt-xml-http-request) \
-		$(use_enable qt4 qt-script-runtime) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_test() {
-	#If someone wants to guarantee that emake will not make
-	#tests fail promiscuosly, please do, otherwise we're using make.
-	make check &> "${WORKDIR}"/check
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-curl_die() {
-	eerror "net-misc/curl must be built with these use flags: ssl -gnutls -nss"
-	eerror "to do so, do:"
-	eerror 'echo "net-misc/curl ssl -gnutls -nss" >> /etc/portage/package.use'
-	die "Your net-misc/curl was misconfigured."
-}
diff --git a/x11-misc/google-gadgets/google-gadgets-0.10.2-r2.ebuild b/x11-misc/google-gadgets/google-gadgets-0.10.2-r2.ebuild
deleted file mode 100644
index 9a175f1ed2df..000000000000
--- a/x11-misc/google-gadgets/google-gadgets-0.10.2-r2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.10.2-r2.ebuild,v 1.3 2008/09/26 13:52:39 loki_val Exp $
-
-EAPI=2
-
-inherit base autotools multilib eutils fdo-mime
-
-MY_PN=${PN}-for-linux
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Cool gadgets from Google for your Desktop"
-HOMEPAGE="http://code.google.com/p/google-gadgets-for-linux/"
-SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+dbus debug +gtk +qt4 +gstreamer"
-
-# Weird things happen when we start mix-n-matching, so for the time being
-# I've just locked the deps to the versions I had as of Summer 2008. With any
-# luck, they'll be stable when we get to stabling this package.
-
-# FIXME: ggl should be able to compile with xulrunner-1.9, xulrunner-1.8 and
-# various combinations of mozilla and spidermonkey. Since its configure script
-# is broken, though, I've hacked it to depend only on xulrunner-1.9, to avoid
-# mid-air symbol collisions. A giant bonanza of automagic is what it takes to get
-# this to work. I say blah. Blocking spidermonkey to avoid incorrect linking.
-
-#BIG DANGLING NOTE: This fails with gcc <4.2.
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	>=dev-libs/libxml2-2.6.32
-	sys-libs/zlib
-	net-libs/xulrunner:1.9
-	!!dev-lang/spidermonkey
-
-	dbus? ( sys-apps/dbus )
-
-	gstreamer? (	>=media-libs/gstreamer-0.10.19
-			>=media-libs/gst-plugins-base-0.10.19 )
-
-	gtk? (	dbus? ( >=dev-libs/dbus-glib-0.74 )
-		>=x11-libs/cairo-1.6.4
-		>=x11-libs/gtk+-2.12.10
-		>=x11-libs/pango-1.20.3
-		gnome-base/librsvg
-		>=net-misc/curl-7.18.2[ssl,-nss,-gnutls]
-		>=dev-libs/atk-1.22.0 )
-
-	qt4? (	dbus? ( >=x11-libs/qt-dbus-4.4.0 )
-		>=x11-libs/qt-core-4.4.0
-		>=x11-libs/qt-webkit-4.4.0
-		>=x11-libs/qt-xmlpatterns-4.4.0
-		>=x11-libs/qt-opengl-4.4.0
-		>=x11-libs/qt-script-4.4.0 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.20"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-pkg_setup() {
-
-	# If a non-google, non-qt4 and non-gtk host system for google-gadgets is ever developed,
-	# I'll consider changing the error below.
-	if ! use gtk && ! use qt4
-	then
-		eerror "You must choose which toolkit to build for. Either qt4 or gtk can be"
-		eerror "chosen. For qt4, see also above. To enable \$toolkit, do:"
-		eerror "echo \"${CATEGORY}/${PN} \$toolkit\" >> /etc/portage/package.use"
-		die "You need to choose a toolkit"
-	fi
-
-	if ! use gstreamer
-	then
-		ewarn "Disabling gstreamer disables the multimedia functions of ${PN}."
-		ewarn "This is not recommended. To enable gstreamer, do:"
-		ewarn "echo \"${CATEGORY}/${PN} gstreamer\" >> /etc/portage/package.use"
-	fi
-
-}
-
-src_unpack() {
-	base_src_unpack
-	cd "${S}"
-
-	sed -i -r \
-		-e '/^GGL_SYSDEPS_INCLUDE_DIR/ c\GGL_SYSDEPS_INCLUDE_DIR=$GGL_INCLUDE_DIR' \
-		configure.ac||die "404"
-	eautoreconf
-}
-
-src_configure() {
-	#For the time being, the smjs-script runtime is required for both gtk and qt
-	#versions, but the goal is to make the qt4 version depend only on qt-script.
-	has_pkg_smjs=no \
-	econf	--disable-dependency-tracking \
-		--disable-update-desktop-database \
-		--disable-update-mime-database \
-		--disable-werror \
-		--enable-libxml2-xml-parser \
-		--enable-smjs-script-runtime \
-		--with-gtkmozembed=libxul \
-		--with-smjs-cppflags=-I/usr/include/nspr \
-		--with-smjs-libdir=/usr/$(get_libdir)/xulrunner-1.9 \
-		--with-smjs-incdir=/usr/include/xulrunner-1.9/unstable \
-		$(use_enable debug) \
-		$(use_enable dbus libggadget-dbus) \
-		$(use_enable gstreamer gst-audio-framework) \
-		$(use_enable gstreamer gst-mediaplayer-element) \
-		$(use_enable gtk gtk-host) \
-		$(use_enable gtk libggadget-gtk ) \
-		$(use_enable gtk gtkmoz-browser-element) \
-		$(use_enable gtk gtk-system-framework) \
-		$(use_enable gtk curl_xml_http_request) \
-		$(use_enable qt4 qt-host) \
-		$(use_enable qt4 libggadget-qt) \
-		$(use_enable qt4 qt-system-framework) \
-		$(use_enable qt4 qtwebkit-browser-element) \
-		$(use_enable qt4 qt-xml-http-request) \
-		$(use_enable qt4 qt-script-runtime) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	default_src_compile
-	#See https://bugs.gentoo.org/238753
-}
-
-src_test() {
-	#If someone wants to guarantee that emake will not make
-	#tests fail promiscuosly, please do, otherwise we're using make.
-	make check &> "${WORKDIR}"/check
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-curl_die() {
-	eerror "net-misc/curl must be built with these use flags: ssl -gnutls -nss"
-	eerror "to do so, do:"
-	eerror 'echo "net-misc/curl ssl -gnutls -nss" >> /etc/portage/package.use'
-	die "Your net-misc/curl was misconfigured."
-}
diff --git a/x11-misc/google-gadgets/google-gadgets-0.10.5.ebuild b/x11-misc/google-gadgets/google-gadgets-0.10.5.ebuild
index 52d3e68b77c4..eb234b90bab8 100644
--- a/x11-misc/google-gadgets/google-gadgets-0.10.5.ebuild
+++ b/x11-misc/google-gadgets/google-gadgets-0.10.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.10.5.ebuild,v 1.3 2009/02/05 03:03:32 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.10.5.ebuild,v 1.4 2009/02/16 13:26:57 voyageur Exp $
 
 EAPI=2
 
@@ -8,9 +8,11 @@ inherit base autotools multilib eutils fdo-mime
 
 MY_PN=${PN}-for-linux
 MY_P=${MY_PN}-${PV}
+
 DESCRIPTION="Cool gadgets from Google for your Desktop"
 HOMEPAGE="http://code.google.com/p/google-gadgets-for-linux/"
 SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tar.bz2"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
@@ -20,64 +22,63 @@ IUSE="+dbus debug +gtk +qt4 +gstreamer networkmanager startup-notification"
 # I've just locked the deps to the versions I had as of Summer 2008. With any
 # luck, they'll be stable when we get to stabling this package.
 
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
+RDEPEND="
 	>=dev-libs/libxml2-2.6.32
-	sys-libs/zlib
 	net-libs/xulrunner:1.9
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
 	dbus? ( sys-apps/dbus )
-	gstreamer? ( >=media-libs/gstreamer-0.10.19
-			>=media-libs/gst-plugins-base-0.10.19 )
-
-	gtk? ( dbus? ( >=dev-libs/dbus-glib-0.74 )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10.19
+		>=media-libs/gst-plugins-base-0.10.19
+	)
+	gtk? (
+		>=dev-libs/atk-1.22.0
+		gnome-base/librsvg
+		>=net-misc/curl-7.18.2
 		>=x11-libs/cairo-1.6.4
 		>=x11-libs/gtk+-2.12.10
 		>=x11-libs/pango-1.20.3
-		gnome-base/librsvg
-		>=net-misc/curl-7.18.2
-		>=dev-libs/atk-1.22.0 )
-
+		dbus? ( >=dev-libs/dbus-glib-0.74 )
+	)
 	networkmanager? ( net-misc/networkmanager )
-	startup-notification? ( x11-libs/startup-notification )
-
-	qt4? ( dbus? ( >=x11-libs/qt-dbus-4.4.0 )
+	qt4? (
 		>=x11-libs/qt-core-4.4.0
+		>=x11-libs/qt-opengl-4.4.0
+		>=x11-libs/qt-script-4.4.0
 		>=x11-libs/qt-webkit-4.4.0
 		>=x11-libs/qt-xmlpatterns-4.4.0
-		>=x11-libs/qt-opengl-4.4.0
-		>=x11-libs/qt-script-4.4.0 )"
+		dbus? ( >=x11-libs/qt-dbus-4.4.0 )
+	)
+	startup-notification? ( x11-libs/startup-notification )
+"
 DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.20"
+	>=dev-util/pkgconfig-0.20
+"
 
 S="${WORKDIR}/${MY_P}"
 
 RESTRICT="test"
 
 pkg_setup() {
-
 	# If a non-google, non-qt4 and non-gtk host system for google-gadgets is ever developed,
 	# I'll consider changing the error below.
-	if ! use gtk && ! use qt4
-	then
+	if ! use gtk && ! use qt4; then
 		eerror "You must choose which toolkit to build for. Either qt4 or gtk can be"
 		eerror "chosen. For qt4, see also above. To enable \$toolkit, do:"
 		eerror "echo \"${CATEGORY}/${PN} \$toolkit\" >> /etc/portage/package.use"
 		die "You need to choose a toolkit"
 	fi
 
-	if ! use gstreamer
-	then
+	if ! use gstreamer; then
 		ewarn "Disabling gstreamer disables the multimedia functions of ${PN}."
 		ewarn "This is not recommended. To enable gstreamer, do:"
 		ewarn "echo \"${CATEGORY}/${PN} gstreamer\" >> /etc/portage/package.use"
 	fi
-
 }
 
-src_unpack() {
-	base_src_unpack
-	cd "${S}"
-
+src_prepare() {
 	sed -i -r \
 		-e '/^GGL_SYSDEPS_INCLUDE_DIR/ c\GGL_SYSDEPS_INCLUDE_DIR=$GGL_INCLUDE_DIR' \
 		configure.ac||die "404"
@@ -115,8 +116,7 @@ src_configure() {
 		$(use_enable qt4 qt-system-framework) \
 		$(use_enable qt4 qtwebkit-browser-element) \
 		$(use_enable qt4 qt-xml-http-request) \
-		$(use_enable qt4 qt-script-runtime) \
-		|| die "econf failed"
+		$(use_enable qt4 qt-script-runtime)
 }
 
 src_test() {
@@ -133,4 +133,4 @@ src_install() {
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
-}
+}
\ No newline at end of file