Final 0.21.2 version

6 files changed, 7 insertions, 116 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 99fdfbaddc6e..ffaf2bfa8160 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,12 +1,13 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.7 2003/09/14 11:59:51 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.8 2003/09/14 12:13:58 obz Exp $
 
 *gdesklets-core-0.21.2 (14 Sep 2003)
 
   14 Sep 2003; Mike Gardiner <obz@gentoo.org> gdesklets-core-0.21.2.ebuild,
   gdesklets-core-0.21.ebuild:
-  New version which includes the External sensor, removed older 0.21
+  New version which includes the External sensor, removed older 0.21.x. All
+  traces of the External sensor are gone apart from this -core.
 
 *gdesklets-core-0.21.1 (11 Sep 2003)
 
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
index 68120588ae15..87751957c628 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -1,8 +1,5 @@
-MD5 761ff2485205f70d132ff18049cf4f75 gdesklets-core-0.21.2.ebuild 2285
-MD5 041ab5adc309a309ac45bd6daf97f2c5 gdesklets-core-0.21.1.ebuild 2150
-MD5 7c397bea71fe732211028e362901bb4d ChangeLog 1397
+MD5 02ba6a482dcce219caabfae529119e2e gdesklets-core-0.21.2.ebuild 2254
+MD5 458e934c77ead641983001fcfc91899b ChangeLog 1468
 MD5 a175a96fb7e85b152ade748dbd2360e0 metadata.xml 213
-MD5 292009508885d9346f12f3378ebb9343 files/digest-gdesklets-core-0.21.1 69
 MD5 060c19d7290af0765fb82262fab63524 files/digest-gdesklets-core-0.21.2 69
-MD5 f6665800ba401c296ee9090ec0430ad8 files/gdesklets-core-0.21-Sensors.patch 1775
 MD5 01751d3aa9192793a33c02d2126192c1 files/gdesklets-displays.desktop 230
diff --git a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.21.1 b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.21.1
deleted file mode 100644
index b78fc5591b59..000000000000
--- a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.21.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d9ccbd4f88cb988d349a98495694ef26 gDesklets-0.21.1.tar.bz2 244483
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.21-Sensors.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.21-Sensors.patch
deleted file mode 100644
index b2a2dccdeff8..000000000000
--- a/gnome-extra/gdesklets-core/files/gdesklets-core-0.21-Sensors.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- configure.old	2003-09-11 16:28:53.633506672 +0800
-+++ configure	2003-09-11 16:29:35.545135136 +0800
-@@ -9617,7 +9617,7 @@
- fi
- 
- 
--                                                                                                                                                                                    ac_config_files="$ac_config_files Makefile config/Makefile data/Makefile desktop/Makefile doc/Makefile doc/man/Makefile display/Makefile factory/Makefile libdesklets/Makefile locale/Makefile main/Makefile po/Makefile sensor/Makefile Sensors/Makefile Sensors/External/Makefile Sensors/FontSelector/Makefile utils/Makefile gdesklets-core.pc"
-+                                                                                                                                                                                    ac_config_files="$ac_config_files Makefile config/Makefile data/Makefile desktop/Makefile doc/Makefile doc/man/Makefile display/Makefile factory/Makefile libdesklets/Makefile locale/Makefile main/Makefile po/Makefile sensor/Makefile utils/Makefile gdesklets-core.pc"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
---- configure.in.old	2003-09-11 16:29:00.404477328 +0800
-+++ configure.in	2003-09-11 16:30:52.633415936 +0800
-@@ -66,9 +66,6 @@
- main/Makefile
- po/Makefile
- sensor/Makefile
--Sensors/Makefile
--Sensors/External/Makefile
--Sensors/FontSelector/Makefile
- utils/Makefile
- gdesklets-core.pc
- ])
---- Makefile.in.old	2003-09-11 16:29:06.695520944 +0800
-+++ Makefile.in	2003-09-11 16:31:11.226589344 +0800
-@@ -181,7 +181,6 @@
- AUTOMAKE_OPTIONS = 1.6 dist-bzip2
- 
- SUBDIRS = \
--	Sensors	\
- 	config	\
- 	data	\
- 	desktop	\
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.21.1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.21.1.ebuild
deleted file mode 100644
index 8c6eb61d09c4..000000000000
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.21.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.21.1.ebuild,v 1.2 2003/09/11 23:32:28 msterret Exp $
-
-inherit gnome2
-
-MY_PN="gDesklets"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="GNOME Desktop Applets: core library for the desktop applets"
-SRC_URI="http://www.pycage.de/download/gdesklets/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.pycage.de/software_gdesklets.html"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86"
-
-RDEPEND=">=dev-lang/python-2.2
-	>=gnome-base/gconf-2
-	>=dev-python/pygtk-1.99.14
-	>=dev-python/gnome-python-1.99.14
-	>=x11-libs/gtk+-2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-USE_DESTDIR="1"
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
-
-src_unpack( ) {
-	unpack ${A}
-	cd ${S}
-	# patch to prevent building the External and FontSelector
-	# sensors included here, because we're using the ones
-	# from x11-plugins/
-	epatch ${FILESDIR}/gdesklets-core-0.21-Sensors.patch
-}
-
-src_install( ) {
-	gnome2_src_install
-	# there are two links that end up pointing inside the
-	# image that we need to fix up here
-	dosym /usr/share/gdesklets/gdesklets /usr/bin/gdesklets
-	dosym /usr/share/pixmaps/gdesklets.png \
-		  /usr/share/gdesklets/data/gdesklets.png
-
-	# and install the display navigation desktop
-	insinto /usr/share/applications
-	doins ${FILESDIR}/gdesklets-displays.desktop
-}
-
-pkg_postinst( ) {
-
-	echo ""
-	einfo "gDesklets Displays are required before the library"
-	einfo "will be usable for you. The displays are found in - "
-	einfo "           x11-plugins/desklet-*"
-	einfo "Please install at least one of these before using"
-	einfo "gDesklets. Next, you'll need to run 'gdesklets' "
-	einfo "and then add the Displays from - "
-	einfo "         /usr/share/gdesklets/Displays"
-	einfo "If you're using GNOME this can be done conveniently"
-	einfo "through Applications->Accessories menu"
-	echo ""
-	ewarn "If you are updating from a previous version of gDesklets"
-	ewarn "you may need to re-emerge Displays that complain on"
-	ewarn "startup"
-	echo ""
-}
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.21.2.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.21.2.ebuild
index 56c3dcca7352..dfcb1323a58c 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.21.2.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.21.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.21.2.ebuild,v 1.2 2003/09/14 11:59:51 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.21.2.ebuild,v 1.3 2003/09/14 12:13:58 obz Exp $
 
 inherit gnome2
 
@@ -25,8 +25,7 @@ RDEPEND=">=dev-lang/python-2.2
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	dev-util/intltool
-	!x11-plugins/desklet-external"
+	dev-util/intltool"
 
 # the external desklet is included in this version, we don't
 # use the one from x11-plugins anymore