New version

5 files changed, 22 insertions, 20 deletions

diff --git a/x11-plugins/desklet-sysinfo/ChangeLog b/x11-plugins/desklet-sysinfo/ChangeLog
index 929c4cf32106..351875561211 100644
--- a/x11-plugins/desklet-sysinfo/ChangeLog
+++ b/x11-plugins/desklet-sysinfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/desklet-sysinfo
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sysinfo/ChangeLog,v 1.3 2003/11/20 20:31:19 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sysinfo/ChangeLog,v 1.4 2004/01/11 03:35:32 obz Exp $
+
+*desklet-sysinfo-0.25 (11 Jan 2004)
+
+  11 Jan 2004; Mike Gardiner <obz@gentoo.org> desklet-sysinfo-0.21.2.ebuild,
+  desklet-sysinfo-0.25.ebuild:
+  New version, works with gdesklets-core >= 0.25.1
 
   20 Nov 2003; David Holm <dholm@gentoo.org> desklet-sysinfo-0.21.2-r1.ebuild:
   Added to ~ppc.
diff --git a/x11-plugins/desklet-sysinfo/Manifest b/x11-plugins/desklet-sysinfo/Manifest
index d637e836c2d7..cf50b9a129cc 100644
--- a/x11-plugins/desklet-sysinfo/Manifest
+++ b/x11-plugins/desklet-sysinfo/Manifest
@@ -1,6 +1,6 @@
-MD5 c747a26fc8ccec4b953b6670a577f0c3 ChangeLog 730
-MD5 095032fc24ded9041f360e1fdee92b18 desklet-sysinfo-0.21.2.ebuild 1257
-MD5 a175a96fb7e85b152ade748dbd2360e0 metadata.xml 213
+MD5 9d8419ba8648af7fa8b0ac366891e38a desklet-sysinfo-0.25.ebuild 1276
+MD5 0854332029849bb4f2d8e7a81aa1009a ChangeLog 925
 MD5 a4b30f9637e9dbed2b463e1cfaecaa06 desklet-sysinfo-0.21.2-r1.ebuild 1387
-MD5 eb71deef462934e33fc7f16506ab21d3 files/digest-desklet-sysinfo-0.21.2 66
+MD5 a175a96fb7e85b152ade748dbd2360e0 metadata.xml 213
+MD5 bb51f83ed2ef765a94447df8fbeb80d1 files/digest-desklet-sysinfo-0.25 65
 MD5 eb71deef462934e33fc7f16506ab21d3 files/digest-desklet-sysinfo-0.21.2-r1 66
diff --git a/x11-plugins/desklet-sysinfo/desklet-sysinfo-0.21.2.ebuild b/x11-plugins/desklet-sysinfo/desklet-sysinfo-0.25.ebuild
index f53b43b4b910..88f7e7cb4143 100644
--- a/x11-plugins/desklet-sysinfo/desklet-sysinfo-0.21.2.ebuild
+++ b/x11-plugins/desklet-sysinfo/desklet-sysinfo-0.25.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/x11-plugins/desklet-sysinfo/desklet-sysinfo-0.21.2.ebuild,v 1.1 2003/09/30 11:24:46 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-sysinfo/desklet-sysinfo-0.25.ebuild,v 1.1 2004/01/11 03:35:32 obz Exp $
 
 DESKLET_NAME="SysInfo"
 
@@ -14,22 +14,13 @@ LICENSE="as-is"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
-DEPEND=">=gnome-extra/gdesklets-core-0.22"
+DEPEND=">=gnome-extra/gdesklets-core-0.24"
 
-DOCS="AUTHORS ChangeLog"
+DOCS="ChangeLog"
 
-src_unpack( ) {
-
-	# *grumble* if you compress an archive using gunzip,
-	# why would you suffix it .tar.bz2 ? <obz@gentoo.org>
-	cd ${WORKDIR}
-	tar zxfv ${DISTDIR}/${MY_P}.tar.bz2
-
-}
-
-src_install( ) {
+src_install() {
 
 	SYS_PATH="/usr/share/gdesklets"
 	INSTALL_BIN="Install_${DESKLET_NAME}_Sensor.bin"
@@ -46,8 +37,13 @@ src_install( ) {
 
 	# and finally the graphics
 	cp -R gfx/ ${D}${SYS_PATH}/Displays/${DESKLET_NAME}
+	# remove extraneous CVS dir
+	rm -rf ${D}${SYS_PATH}/Displays/${DESKLET_NAME}/gfx/CVS
 
 	dodoc ${DOCS}
 
+	# desklets unpack preserves the permissions of the archive
+	chown -R root:root ${D}${SYS_PATH}/Sensors/${DESKLET_NAME}
+
 }
 
diff --git a/x11-plugins/desklet-sysinfo/files/digest-desklet-sysinfo-0.21.2 b/x11-plugins/desklet-sysinfo/files/digest-desklet-sysinfo-0.21.2
deleted file mode 100644
index e91f2ddbfc06..000000000000
--- a/x11-plugins/desklet-sysinfo/files/digest-desklet-sysinfo-0.21.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 588c0f52ee113fe8abaa384367753547 SysInfo-0.21.2.tar.bz2 30322
diff --git a/x11-plugins/desklet-sysinfo/files/digest-desklet-sysinfo-0.25 b/x11-plugins/desklet-sysinfo/files/digest-desklet-sysinfo-0.25
new file mode 100644
index 000000000000..612559caf1da
--- /dev/null
+++ b/x11-plugins/desklet-sysinfo/files/digest-desklet-sysinfo-0.25
@@ -0,0 +1 @@
+MD5 6d6c6c21b0f73227c33649d07a88b4c6 SysInfo-0.25.tar.bz2 145588