Added a revised 0.4-r2 with changes for the new gdesklets eclass

(Portage version: 2.0.51.19)

8 files changed, 82 insertions, 19 deletions

diff --git a/x11-plugins/desklet-goodweather/ChangeLog b/x11-plugins/desklet-goodweather/ChangeLog
index 9b8c9dc42fe6..82cc14fedb14 100644
--- a/x11-plugins/desklet-goodweather/ChangeLog
+++ b/x11-plugins/desklet-goodweather/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/desklet-goodweather
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-goodweather/ChangeLog,v 1.11 2005/04/23 04:13:20 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-goodweather/ChangeLog,v 1.12 2005/04/23 04:27:05 obz Exp $
+
+*desklet-goodweather-0.4-r2 (23 Apr 2005)
+
+  23 Apr 2005; Mike Gardiner <obz@gentoo.org>
+  desklet-goodweather-0.4-r1.ebuild, +desklet-goodweather-0.4-r2.ebuild:
+  Added a revised 0.4-r2 with changes for the new gdesklets eclass
 
   23 Apr 2005; Joe Sapp <nixphoeni@gentoo.org>
   desklet-goodweather-0.4-r1.ebuild:
diff --git a/x11-plugins/desklet-goodweather/Manifest b/x11-plugins/desklet-goodweather/Manifest
index 2ee299cce285..2dc6d500c601 100644
--- a/x11-plugins/desklet-goodweather/Manifest
+++ b/x11-plugins/desklet-goodweather/Manifest
@@ -1,8 +1,10 @@
-MD5 af591ecf9ff41119edce4e379ad9cf6b desklet-goodweather-0.4.ebuild 1234
-MD5 fa9c0600b4375c50e6ea47565061ad18 desklet-goodweather-0.3.ebuild 1233
 MD5 a0988856bc0aedc9b472d09472577d84 ChangeLog 2075
-MD5 511596a96679ecc1b8c9df9741515b5f desklet-goodweather-0.4-r1.ebuild 718
+MD5 fa9c0600b4375c50e6ea47565061ad18 desklet-goodweather-0.3.ebuild 1233
+MD5 af591ecf9ff41119edce4e379ad9cf6b desklet-goodweather-0.4.ebuild 1234
 MD5 a175a96fb7e85b152ade748dbd2360e0 metadata.xml 213
+MD5 4f219043d3075694d499b9ab1f5b58ed desklet-goodweather-0.4-r1.ebuild 1362
+MD5 511596a96679ecc1b8c9df9741515b5f desklet-goodweather-0.4-r2.ebuild 718
 MD5 a313796e2744c9b050b1ab855068f76a files/digest-desklet-goodweather-0.3 69
 MD5 7fedd8d801fa3552ee5c7bb079954b14 files/digest-desklet-goodweather-0.4 69
-MD5 00adc8fbd46656e8bb502804823337d7 files/digest-desklet-goodweather-0.4-r1 64
+MD5 7fedd8d801fa3552ee5c7bb079954b14 files/digest-desklet-goodweather-0.4-r1 69
+MD5 00adc8fbd46656e8bb502804823337d7 files/digest-desklet-goodweather-0.4-r2 64
diff --git a/x11-plugins/desklet-goodweather/desklet-goodweather-0.3.ebuild b/x11-plugins/desklet-goodweather/desklet-goodweather-0.3.ebuild
index 0b1171efa93a..767a403a78a4 100644
--- a/x11-plugins/desklet-goodweather/desklet-goodweather-0.3.ebuild
+++ b/x11-plugins/desklet-goodweather/desklet-goodweather-0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-goodweather/desklet-goodweather-0.3.ebuild,v 1.7 2004/09/02 18:22:39 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-goodweather/desklet-goodweather-0.3.ebuild,v 1.8 2005/04/23 04:27:05 obz Exp $
 
 DESKLET_NAME="GoodWeather"
 
diff --git a/x11-plugins/desklet-goodweather/desklet-goodweather-0.4-r1.ebuild b/x11-plugins/desklet-goodweather/desklet-goodweather-0.4-r1.ebuild
index 51e44e7e2fde..eaaa5e7549c3 100644
--- a/x11-plugins/desklet-goodweather/desklet-goodweather-0.4-r1.ebuild
+++ b/x11-plugins/desklet-goodweather/desklet-goodweather-0.4-r1.ebuild
@@ -1,25 +1,54 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-goodweather/desklet-goodweather-0.4-r1.ebuild,v 1.2 2005/04/23 04:13:20 nixphoeni Exp $
-
-inherit gdesklets
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-goodweather/desklet-goodweather-0.4-r1.ebuild,v 1.3 2005/04/23 04:27:05 obz Exp $
 
 DESKLET_NAME="GoodWeather"
-SENSOR_NAME="${DESKLET_NAME}"
 
-MY_P=${DESKLET_NAME}
+MY_P=${DESKLET_NAME}-${PV}
 S=${WORKDIR}/${DESKLET_NAME}
 
-DESCRIPTION="A desklet showing a weather forecast for the coming week"
-SRC_URI="http://gdesklets.gnomedesktop.org/files/${MY_P}.tar.gz"
+DESCRIPTION="A desklet producing weather forecasts for the coming week"
+SRC_URI="http://gdesklets.gnomedesktop.org/files/${MY_P}.tar.bz2"
 HOMEPAGE="http://gdesklets.gnomedesktop.org/categories.php?func=gd_show_app&gd_app_id=93"
 LICENSE="as-is"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64 ~alpha"
 
-RDEPEND=">=gnome-extra/gdesklets-core-0.34.3"
+DEPEND=">=gnome-extra/gdesklets-core-0.26"
 
 DOCS="README"
 
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# fix the "metha/meta" typo for gdesklets-0.3x
+	sed -i -e "s:metha:meta:" GoodWeather.display
+
+}
+
+src_install() {
+
+	SYS_PATH="/usr/share/gdesklets"
+	INSTALL_BIN="Install_${DESKLET_NAME}_Sensor.bin"
+	dodir ${SYS_PATH}/{Sensors,Displays}
+
+	# first we install the Sensor
+	python ${INSTALL_BIN} --nomsg ${D}${SYS_PATH}/Sensors
+
+	# and then the .displays
+	insinto ${SYS_PATH}/Displays/${DESKLET_NAME}
+	doins *.display
+
+	# and finally the graphics
+	cp -R gfx/ ${D}${SYS_PATH}/Displays/${DESKLET_NAME}
+
+	dodoc ${DOCS}
+
+	# the desklets unpack preserves permissions of the archive
+	chown -R root:root ${D}${SYS_PATH}/Sensors/${DESKLET_NAME}
+
+}
+
diff --git a/x11-plugins/desklet-goodweather/desklet-goodweather-0.4-r2.ebuild b/x11-plugins/desklet-goodweather/desklet-goodweather-0.4-r2.ebuild
new file mode 100644
index 000000000000..cf36d57b3277
--- /dev/null
+++ b/x11-plugins/desklet-goodweather/desklet-goodweather-0.4-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-goodweather/desklet-goodweather-0.4-r2.ebuild,v 1.1 2005/04/23 04:27:05 obz Exp $
+
+inherit gdesklets
+
+DESKLET_NAME="GoodWeather"
+SENSOR_NAME="${DESKLET_NAME}"
+
+MY_P=${DESKLET_NAME}
+S=${WORKDIR}/${DESKLET_NAME}
+
+DESCRIPTION="A desklet showing a weather forecast for the coming week"
+SRC_URI="http://gdesklets.gnomedesktop.org/files/${MY_P}.tar.gz"
+HOMEPAGE="http://gdesklets.gnomedesktop.org/categories.php?func=gd_show_app&gd_app_id=93"
+LICENSE="as-is"
+
+SLOT="0"
+IUSE=""
+KEYWORDS="~x86"
+
+RDEPEND=">=gnome-extra/gdesklets-core-0.34.3"
+
+DOCS="README"
+
diff --git a/x11-plugins/desklet-goodweather/desklet-goodweather-0.4.ebuild b/x11-plugins/desklet-goodweather/desklet-goodweather-0.4.ebuild
index 37904f7edd26..58ffeef543eb 100644
--- a/x11-plugins/desklet-goodweather/desklet-goodweather-0.4.ebuild
+++ b/x11-plugins/desklet-goodweather/desklet-goodweather-0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-goodweather/desklet-goodweather-0.4.ebuild,v 1.4 2004/09/02 18:22:39 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-goodweather/desklet-goodweather-0.4.ebuild,v 1.5 2005/04/23 04:27:05 obz Exp $
 
 DESKLET_NAME="GoodWeather"
 
diff --git a/x11-plugins/desklet-goodweather/files/digest-desklet-goodweather-0.4-r1 b/x11-plugins/desklet-goodweather/files/digest-desklet-goodweather-0.4-r1
index 0d3eed60e072..f733a678e3fc 100644
--- a/x11-plugins/desklet-goodweather/files/digest-desklet-goodweather-0.4-r1
+++ b/x11-plugins/desklet-goodweather/files/digest-desklet-goodweather-0.4-r1
@@ -1 +1 @@
-MD5 2470e742a04bd21c0d9492631fc9be1b GoodWeather.tar.gz 1458927
+MD5 ad7851fed9de6f8adc35d522d5b08cdb GoodWeather-0.4.tar.bz2 1460955
diff --git a/x11-plugins/desklet-goodweather/files/digest-desklet-goodweather-0.4-r2 b/x11-plugins/desklet-goodweather/files/digest-desklet-goodweather-0.4-r2
new file mode 100644
index 000000000000..0d3eed60e072
--- /dev/null
+++ b/x11-plugins/desklet-goodweather/files/digest-desklet-goodweather-0.4-r2
@@ -0,0 +1 @@
+MD5 2470e742a04bd21c0d9492631fc9be1b GoodWeather.tar.gz 1458927