MY_P no longer needs to be defined since it's done in the eclass - just have to define DESKLET_NAME before inheriting it. RDEPEND does not need to be redefined since it's in the eclass too, so I removed it. Also quoted and removed old versions.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

5 files changed, 16 insertions, 58 deletions

diff --git a/x11-plugins/desklet-ftb/ChangeLog b/x11-plugins/desklet-ftb/ChangeLog
index 16a4dcc36400..86f6d7a079ee 100644
--- a/x11-plugins/desklet-ftb/ChangeLog
+++ b/x11-plugins/desklet-ftb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/desklet-ftb
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-ftb/ChangeLog,v 1.13 2007/02/21 23:17:02 jokey Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-ftb/ChangeLog,v 1.14 2009/04/28 01:29:22 nixphoeni Exp $
+
+  28 Apr 2009; Joe Sapp <nixphoeni@gentoo.org> -desklet-ftb-0.3.ebuild,
+  -desklet-ftb-0.3.1.ebuild, desklet-ftb-0.3.2:
+  MY_P no longer needs to be defined since it's done in the eclass - just
+  have to define DESKLET_NAME before inheriting it. RDEPEND does not need to
+  be redefined since it's in the eclass too, so I removed it. Also quoted
+  like a good dev.  Finally, removed old crusty versions.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/desklet-ftb/Manifest b/x11-plugins/desklet-ftb/Manifest
index fc9cb6c49e30..55f56d58c80e 100644
--- a/x11-plugins/desklet-ftb/Manifest
+++ b/x11-plugins/desklet-ftb/Manifest
@@ -1,8 +1,4 @@
-DIST FTB-0.3,1.tar.gz 55053 RMD160 8f9b9544709c1ab7b0d6c30a8254cef3139a3380 SHA1 8503a2aa6b0d504c2f0ac808788b298f05259f26 SHA256 feeefdccff86aec53693f770a62ff05ed244c7562975b3d22767091359b6a0d6
 DIST FTB-0.3.2.tar.gz 183231 RMD160 a4f3be98f45e78c7e967cb3107ad867fd35d2540 SHA1 e7f12af3703f534bc16922a00bc9e2b9316c17a0 SHA256 62b821d677cb4111449e49d35ae30b206ba6621661d44479ce34ecd3f9a6150c
-DIST FTB-0.3.tar.gz 54633 RMD160 72f3289d273611f32e0dc77549c38d4d92f03db5 SHA1 9296ac2de9b3abbd20dd24f678d178a6c1493973 SHA256 f6d7729a05505c435e89f94753dd3f138d64f2ad6367268310101cdb239ca37d
-EBUILD desklet-ftb-0.3.1.ebuild 721 RMD160 0b48c868e438ba358bc526f0ea71976745070c53 SHA1 0b60b40cbe0c3fc12a40662fc7bfd56a0068a669 SHA256 0dc3e495fc2164481845da48557960558e9cde390a849ed8a70d1c3ae1c2e40c
-EBUILD desklet-ftb-0.3.2.ebuild 647 RMD160 80a57faf333c02e8008b7eb270b3e18890dd7275 SHA1 daf7cb45f970917675bd114a1a5ab3adcab15bb8 SHA256 115e79fd576f1144a749dee06912345d8dc828e8d64cb686cabfbf31d037ddf8
-EBUILD desklet-ftb-0.3.ebuild 647 RMD160 cb79f440c343ef5adb3c2e3a6ba9e9cd9062f80d SHA1 0da52b2ee9d9ba039a3b7aae999a4afc3902adeb SHA256 f295fb2b060602b2b393f234c880ff0d28cfee30bc72a6434d7c1fbd28ee42e3
-MISC ChangeLog 1611 RMD160 eae7e1296218ecda3f712e585389c047b0a83b36 SHA1 536b9ae05163361c6df18c1b52cc8199ddef0dfc SHA256 787531c95c6fa271532988a52d6d82768c244891d8b8ef291faaf9de2d67f1b7
+EBUILD desklet-ftb-0.3.2.ebuild 576 RMD160 26849974ca8ac82affc78452c109b1edb468888a SHA1 7af26b84c4908f45b41145add346cee579963b11 SHA256 1d1d98b4ca89476b5d58fa06b263b9bab33c190e4437012d24dabdaa88b9ddaf
+MISC ChangeLog 2019 RMD160 a2931df0b9bb5ed51b2adcc252859c6093b66338 SHA1 c5cbb753775422a8427c08b822a77bd035f1f7ea SHA256 c2c440240621deae66317a2da9f1a3e43dd475dfb4c3b461ba9f47c86dce82c1
 MISC metadata.xml 162 RMD160 f0200a20b38bb00e3d7282928d8cd4a7f4ffe993 SHA1 72886a8316d003293955d4d014a55e402d5e8b53 SHA256 d26ee944c21492768d05c515a2a4c3e1e9e35938bef05a84578d01b1e99ecf2a
diff --git a/x11-plugins/desklet-ftb/desklet-ftb-0.3.1.ebuild b/x11-plugins/desklet-ftb/desklet-ftb-0.3.1.ebuild
deleted file mode 100644
index 6f1365b7703b..000000000000
--- a/x11-plugins/desklet-ftb/desklet-ftb-0.3.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-ftb/desklet-ftb-0.3.1.ebuild,v 1.2 2005/09/21 22:38:31 hparker Exp $
-
-inherit gdesklets
-
-DESKLET_NAME="FTB"
-
-MY_P="${DESKLET_NAME}-${PV/%.1/,1}" # Replace the last period in the file name with a comma
-S=${WORKDIR}/Displays/${DESKLET_NAME}
-
-DESCRIPTION="Configurable, stackable system monitors"
-HOMEPAGE="http://gdesklets.gnomedesktop.org/categories.php?func=gd_show_app&gd_app_id=224"
-SRC_URI="http://gdesklets.gnomedesktop.org/files/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND=">=gnome-extra/gdesklets-core-0.34.3"
diff --git a/x11-plugins/desklet-ftb/desklet-ftb-0.3.2.ebuild b/x11-plugins/desklet-ftb/desklet-ftb-0.3.2.ebuild
index 0482acc34a2d..e04d04f69227 100644
--- a/x11-plugins/desklet-ftb/desklet-ftb-0.3.2.ebuild
+++ b/x11-plugins/desklet-ftb/desklet-ftb-0.3.2.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-ftb/desklet-ftb-0.3.2.ebuild,v 1.7 2006/10/14 16:06:45 kloeri Exp $
-
-inherit gdesklets
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-ftb/desklet-ftb-0.3.2.ebuild,v 1.8 2009/04/28 01:29:22 nixphoeni Exp $
 
 DESKLET_NAME="FTB"
 
-MY_P="${DESKLET_NAME}-${PV}"
-S=${WORKDIR}/Displays/${DESKLET_NAME}
+inherit gdesklets
+
+S="${WORKDIR}/Displays/${DESKLET_NAME}"
 
 DESCRIPTION="Configurable, stackable system monitors"
 HOMEPAGE="http://www.gdesklets.org/?mod=project/releases&pid=16"
@@ -17,5 +16,3 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 KEYWORDS="alpha ~amd64 ia64 ppc ~x86"
-
-RDEPEND=">=gnome-extra/gdesklets-core-0.34.3"
diff --git a/x11-plugins/desklet-ftb/desklet-ftb-0.3.ebuild b/x11-plugins/desklet-ftb/desklet-ftb-0.3.ebuild
deleted file mode 100644
index 9d1332ccb60d..000000000000
--- a/x11-plugins/desklet-ftb/desklet-ftb-0.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/desklet-ftb/desklet-ftb-0.3.ebuild,v 1.2 2005/07/31 11:26:46 dholm Exp $
-
-inherit gdesklets
-
-DESKLET_NAME="FTB"
-
-MY_P="${DESKLET_NAME}-${PV}"
-S=${WORKDIR}/Displays/${DESKLET_NAME}
-
-DESCRIPTION="Configurable, stackable system monitors"
-HOMEPAGE="http://gdesklets.gnomedesktop.org/categories.php?func=gd_show_app&gd_app_id=224"
-SRC_URI="http://gdesklets.gnomedesktop.org/files/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~ppc ~x86"
-
-RDEPEND=">=gnome-extra/gdesklets-core-0.34.3"