Version bump; typographical fixes

Package-Manager: portage-2.1.6.2/cvs/Linux 2.6.26-tuxonice x86_64

9 files changed, 168 insertions, 27 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 2a0f7f65c9ff..3d30abc3d641 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.92 2008/12/17 04:39:43 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.93 2008/12/30 03:55:44 nixphoeni Exp $
+
+*gdesklets-core-0.36.1 (30 Dec 2008)
+
+  30 Dec 2008; Joe Sapp <nixphoeni@gentoo.org>
+  +files/gdesklets-core-0.36.1-test-control.py-install-fix.patch,
+  gdesklets-core-0.35.2-r1.ebuild, gdesklets-core-0.35.4.ebuild,
+  gdesklets-core-0.36-r1.ebuild, +gdesklets-core-0.36.1.ebuild:
+  Version bump; typographical fixes
 
   17 Dec 2008; Joe Sapp <nixphoeni@gentoo.org> -gdesklets-core-0.36.ebuild:
   Removed 0.36 since 0.36-r1 is stable and replaces it
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
index 34beef822256..1bf03b4dec16 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -2,20 +2,23 @@ AUX gdesklets-control-getid 1146 RMD160 e2a770486e996067c1484f24d73692ce4c34582b
 AUX gdesklets-core-0.35.3-alpha.patch 2928 RMD160 8ab4ca3715f38805e00cd53c9d58b8a02da732c0 SHA1 eca66be05a0e444e562c3470ec5fbe78e1bab6e3 SHA256 525d0d4603aeec94767d731e4a42b9335be1eb37f610681313f286f6a837a6c0
 AUX gdesklets-core-0.35.3-pyorbit_fix.patch 553 RMD160 644bfa170b454d7fa46208695616d56132a06ffe SHA1 68506fa7e0b95236f761054f9d853dcdda2f0c53 SHA256 7e42798826e7434800b22499f16c21af496e54441c783751a6d759a8dacbaa37
 AUX gdesklets-core-0.35.4-POTFILES.in.patch 223 RMD160 2d3c8705022afd84760bdc630bcf3632482b05cd SHA1 5af58cf60b2cfd257fb713096c8b527f0bb52088 SHA256 52a9b45bf68775edd98d832f0fe853be912057dd8fb241687d7a2c0154688038
+AUX gdesklets-core-0.36.1-test-control.py-install-fix.patch 483 RMD160 a3a0b625c92738bb99d19f1332ded97fe717d387 SHA1 b088909f190a39479515b9501918fb7e31a03903 SHA256 2d3ef43385c3e2eb506a714ece81768abe6500f58392514a4b1e327bf098625d
 AUX gdesklets-core-0.36_beta-linguas.patch 1208 RMD160 5b691f445e73316232e394b8dca91601ac57d706 SHA1 d9fe4ed5775921c772b00399f3479afbb4a184d9 SHA256 760a79c3df6c6680ea6b76d787f666a603c919f7fac6b22869a4cb6ab7023b4b
 AUX gdesklets-displays.desktop 237 RMD160 670631d9e1a487c4137cff6db8f0e97bd477a4f0 SHA1 affbfed7e588d65a01df28994ca4575cddca3f38 SHA256 85c0e5f8b40217c4629566bfc45765c0b8a6cf448e02062ce0fffcce63548532
 AUX gdesklets-migration-tool 7343 RMD160 d8d3f992e8786534a184de00bbcd5d1eebf93d4e SHA1 f0e0bd96663a35e1f98b2ec3b377a2b4246cbd33 SHA256 6dd834d92f1a70280e8b3d7b7a005564e0daa5e2769758f47e151044d62cfa48
 DIST gDesklets-0.35.2.tar.bz2 745088 RMD160 23aeca219fbdb1c54b9ed5ba412c7fc93d428e53 SHA1 988a174088894882924d22060396037c8e74c4fd SHA256 b70f959244751b8cf5694abcdc4baeae56d2bf53cd7bac1cef51a254dfe0e2dc
 DIST gDesklets-0.35.3.tar.bz2 718642 RMD160 b40a3d9251d8d67c8cee5369603499f8a8bc4f9d SHA1 ca643579d25c96ce2412cb50ca76241b90dbf6f8 SHA256 7a8df729df1f29b7c37d29739e3188547334781435bf1f9f4fea16d0a29b0c55
 DIST gDesklets-0.35.4.tar.bz2 738665 RMD160 aca07a578850a510beb5a3dd4383a33a79ddd139 SHA1 f225dcc6503e8aaec732c52fc2ee47f70c1fd87c SHA256 f2a1000d8785a479f2226486985d090a7d36284df8b91dd021f09e786bf8e990
+DIST gdesklets-0.36.1.tar.gz 3537820 RMD160 ff658aa32ee562ed0563f01e6c5c7267c0e1fa7c SHA1 a865fd5cd65f4e217fb2c16982961b7b1f6d54cc SHA256 5e0cfd4cd99437aba24dfca33a72b2b6aef33b4c1128064ce82a368280bc6d61
 DIST gdesklets-0.36.tar.bz2 3124773 RMD160 9e8913c2e50c970f02e265a3cb8b59f332e7f77f SHA1 debed7ae730796761ac829ba6cb7bafd566148d5 SHA256 e1a77c8cbb7bf5e51f74394ed54cfc559ca5d81548c0d2b0a858926baa61da4a
 DIST gdesklets-develbook-0.35.2.tar.bz2 547039 RMD160 867790a8482bf822a42d0d240636df351c6cd460 SHA1 936d5b79f319a67fe3c2f3688b5c23b7fd1fb0ca SHA256 dc83853745c032f78d401b8a835b9a7ac162c6c1e7f8357b4d91e2102d898d14
 DIST gdesklets-develbook-0.35.3.tar.bz2 547031 RMD160 a8c3ebc37b62af154116eb6f6aaf9350271da822 SHA1 d5261193acf433a737d29837096eb8cc68513a1e SHA256 208b6f5f92b74ac8b26c2b56a054abec3691264ef2320a386d0cd49b1c63c78d
 DIST gdesklets-develbook-0.35.4.tar.bz2 547047 RMD160 d8655dab61b6e87895be2d3d25100ce99c75a4e7 SHA1 d2595c6d25bbac40c39c90e49fde3ace141e69d5 SHA256 5fcaafe272286bc63edc462b242d4f85827d8a668cdd0ba4a3c988ce949ea4e4
-EBUILD gdesklets-core-0.35.2-r1.ebuild 2711 RMD160 f475048360bf062a57a8465fbfb4e1b7b43c60f1 SHA1 7c60dc27c3aaaa242f04c331427b086ff74ce18c SHA256 6aae5e0bbf385a16bc4f284aaf17e68669f9faacea28930aeeda978f2e27b3ae
-EBUILD gdesklets-core-0.35.3-r1.ebuild 2938 RMD160 9b2c52d3844ade0c9ef1a0fe8e871d090fc6578e SHA1 ff6da5458ce895f06d52e79e628dc7f621168c15 SHA256 fbcfdc34840378bb8b6427696e461acf6c94d7367fabf7428ba56e0df4d61177
-EBUILD gdesklets-core-0.35.3.ebuild 2888 RMD160 ee71584824fec3ae206276467e25f419db93d40c SHA1 6133b98273403ce1bc444c99ba359dc945c6808b SHA256 938518859691fbe93195fbf5bef36ba53b529204d9565064a494fbd57c0df5f3
-EBUILD gdesklets-core-0.35.4.ebuild 3092 RMD160 dba557e7f6dd8652d22a9c880b8967da49d3bd71 SHA1 fec772158a14703f6debb2a33339e0710b4e6c85 SHA256 c39a3a977ed38b7a781733bde3ffb253ed801026603b00b408ee6d47d1dda0a3
-EBUILD gdesklets-core-0.36-r1.ebuild 3185 RMD160 2f6120e5d3da7f295a75472b883ca3d3c51331ea SHA1 0bf8d4ec20ab4efce654af5b4557734195533188 SHA256 84ea2e48d6b74a670dbb9f0bf8c1352ce3c4b04cb0f59558390f1c8a1328ff75
-MISC ChangeLog 17383 RMD160 589f876ec7b6daa17aa36a0593c7fdf7dcf830f9 SHA1 1a190413490e2282c10825644bbf130fb3da7f53 SHA256 d25b9800f109fec769d6daacc04686f4635f2bb56ffe78bf98ea56529e6275e3
+EBUILD gdesklets-core-0.35.2-r1.ebuild 2701 RMD160 8d602772edde62706180421ed8b8b41c20927d22 SHA1 3193b91e60a7624e56f5cd229172c00e16a49d23 SHA256 ab8c8ee5a812bf2d4584f7e499467b4740cb915352f8d411d9f92f18392a78ce
+EBUILD gdesklets-core-0.35.3-r1.ebuild 2938 RMD160 ce3886924845cfe1f31a15411f59eb68db0ac044 SHA1 8301ecceebfd45841031b64cbb608535494b8006 SHA256 bfb5d984f89fb7d81835246ec914b7c920ff24a85050c3a793a5ee80b4b90c4d
+EBUILD gdesklets-core-0.35.3.ebuild 2888 RMD160 62fc70927571d431cdd7128e64bc8af2d94dd3e7 SHA1 a2b2aab4004aef24b59a77a53373b21e2eaabf5e SHA256 002ce4b0e7bcde3b14c1936eb07769b1e6906238babc0f988b4e24e99eefd471
+EBUILD gdesklets-core-0.35.4.ebuild 3082 RMD160 369860f20be031e9f52564693e455f1095658cdb SHA1 ba516eea5c2f555e9f0d7870912011ff6f5ecfd6 SHA256 fa2ce7626e5891882a7960e6226599c70b10ac53493585c6ad1ee539194b9e99
+EBUILD gdesklets-core-0.36-r1.ebuild 3188 RMD160 ee8c97f9c7089907900cf82af5b7e45a3dbb4c9f SHA1 070938bfa41adc410c5753ee9e7b96315a98aec9 SHA256 f88ab2bf47176d76b5f1bd5349b0ed5ddc8e63afcad798d5256622678ca4b2a0
+EBUILD gdesklets-core-0.36.1.ebuild 3355 RMD160 86608ec5461ab2c7ce3644eec82dd52349560cba SHA1 8985aa2d79a6a7a2373dc543e36a47ceedbf8773 SHA256 6f3ea665bdb7cfad3d796c9e2563a87d003f02111267618bea147b97daabc3af
+MISC ChangeLog 17700 RMD160 bc1c77c1f001ccf7071dee30896dd3af7d1eac97 SHA1 3e07ad68fa2b0b711b172fe66def2f3e7181e0d7 SHA256 019e15dc712f989586fd77dd482c530f737dccb34a1e45d241c54315cad66a5c
 MISC metadata.xml 225 RMD160 84ee2a2d6e82c97c9059ca7cfc17f222f18e4431 SHA1 54492f0c3ac21555e1a60882fa7b92103fc3d2c8 SHA256 49feb5b4f0a008e92acb1626adf763199e38ad92f465e41943a89941213ffeef
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.1-test-control.py-install-fix.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.1-test-control.py-install-fix.patch
new file mode 100644
index 000000000000..2b6f35a5f696
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.1-test-control.py-install-fix.patch
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2008-12-28 22:57:11.000000000 -0500
++++ Makefile.am	2008-12-28 22:56:49.000000000 -0500
+@@ -46,7 +46,7 @@
+ 	intltool-update
+ 
+ installdir = ${coredir}
+-install_SCRIPTS = ctrlinfo gdesklets gdesklets-daemon gdesklets-logview gdesklets-migration-tool gdesklets-shell
++install_SCRIPTS = ctrlinfo gdesklets gdesklets-daemon gdesklets-logview gdesklets-migration-tool gdesklets-shell test-control.py
+ 
+ install-data-hook:
+ 	if test '!' -d $(DESTDIR)$(bindir); then \
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.35.2-r1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.35.2-r1.ebuild
index a82f1dfa0f74..c6aba87f9725 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.35.2-r1.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.35.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.2-r1.ebuild,v 1.18 2007/10/09 23:56:02 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.2-r1.ebuild,v 1.19 2008/12/30 03:55:44 nixphoeni Exp $
 
 # We want the latest autoconf and automake (the default)
-inherit gnome2 eutils autotools multilib
+inherit gnome2 eutils multilib
 
 MY_PN="gDesklets"
 MY_P="${MY_PN}-${PV/_/}"
@@ -70,11 +70,11 @@ pkg_postinst() {
 
 	echo
 	elog "gDesklets Displays are required before the library"
-	elog "will be usable. The displays are found in -"
+	elog "will be usable. The Displays are found in -"
 	elog "           x11-plugins/desklet-* ,"
 	elog "at http://www.gdesklets.de, or at http://gdesklets.zencomputer.ca"
 	elog
-	elog "Next you'll need to start gdesklets using"
+	elog "Next you'll need to start gDesklets using"
 	elog "           ${ROOT}usr/bin/gdesklets start"
 	elog "If you're using GNOME this can be done conveniently"
 	elog "through Applications->Accessories->gDesklets"
@@ -83,7 +83,7 @@ pkg_postinst() {
 	elog "you can migrate your desklet configurations by"
 	elog "running"
 	elog "           ${ROOT}usr/$(get_libdir)/gdesklets/gdesklets-migration-tool"
-	elog "after the first time you run gdesklets"
+	elog "after the first time you run gDesklets"
 	echo
 
 	# This stuff is important, especially the migration-tool
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.35.3-r1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.35.3-r1.ebuild
index 6fea08dd0313..2195f0b0fe7d 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.35.3-r1.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.35.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.3-r1.ebuild,v 1.8 2007/10/09 23:56:02 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.3-r1.ebuild,v 1.9 2008/12/30 03:55:44 nixphoeni Exp $
 
 # We want the latest autoconf and automake (the default)
 inherit gnome2 eutils autotools multilib
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild
index 05a1e7a63bb9..4093d8e10073 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild,v 1.12 2007/10/09 23:56:02 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild,v 1.13 2008/12/30 03:55:44 nixphoeni Exp $
 
 # We want the latest autoconf and automake (the default)
 inherit gnome2 eutils autotools multilib
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.35.4.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.35.4.ebuild
index e88affb553b9..2ac69750d382 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.35.4.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.35.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.4.ebuild,v 1.13 2008/04/20 17:42:17 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.4.ebuild,v 1.14 2008/12/30 03:55:44 nixphoeni Exp $
 
 # We want the latest autoconf and automake (the default)
-inherit gnome2 eutils autotools multilib
+inherit gnome2 eutils multilib
 
 MY_PN="gDesklets"
 MY_P="${MY_PN}-${PV/_/}"
@@ -87,11 +87,11 @@ pkg_postinst() {
 
 	echo
 	elog "gDesklets Displays are required before the library"
-	elog "will be usable. The displays are found in -"
+	elog "will be usable. The Displays are found in -"
 	elog "           x11-plugins/desklet-* ,"
 	elog "at http://www.gdesklets.de, or at http://gdesklets.zencomputer.ca"
 	elog
-	elog "Next you'll need to start gdesklets using"
+	elog "Next you'll need to start gDesklets using"
 	elog "           ${ROOT}usr/bin/gdesklets start"
 	elog "If you're using GNOME this can be done conveniently"
 	elog "through Applications->Accessories->gDesklets"
@@ -100,7 +100,7 @@ pkg_postinst() {
 	elog "you can migrate your desklet configurations by"
 	elog "running"
 	elog "           ${ROOT}usr/$(get_libdir)/gdesklets/gdesklets-migration-tool"
-	elog "after the first time you run gdesklets"
+	elog "after the first time you run gDesklets"
 	echo
 
 	# This stuff is important, especially the migration-tool
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild
index 0ec7737480b3..020c02e43ef3 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild,v 1.5 2008/08/25 18:05:40 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild,v 1.6 2008/12/30 03:55:44 nixphoeni Exp $
 
 # We want the latest autoconf and automake (the default)
 inherit gnome2 python eutils autotools multilib
@@ -82,14 +82,14 @@ pkg_postinst() {
 
 	echo
 	elog "gDesklets Displays are required before the library"
-	elog "will be usable.  Core displays (Calendar, Clock, Quote-of-the-Day,"
+	elog "will be usable.  Core Displays (Calendar, Clock, Quote-of-the-Day,"
 	elog "and the 15pieces game) are already installed in"
 	elog "           ${ROOT}usr/$(get_libdir)/gdesklets/Displays"
-	elog "Additional displays can be found in -"
+	elog "Additional Displays can be found in -"
 	elog "           x11-plugins/desklet-* ,"
 	elog "at http://www.gdesklets.de, or at http://gdesklets.zencomputer.ca"
 	elog
-	elog "Next you'll need to start gdesklets using"
+	elog "Next you'll need to start gDesklets using"
 	elog "           ${ROOT}usr/bin/gdesklets start"
 	elog "If you're using GNOME this can be done conveniently through"
 	elog "Applications->Accessories->gDesklets"
@@ -98,7 +98,7 @@ pkg_postinst() {
 	elog "you can migrate your desklet configurations by"
 	elog "running"
 	elog "           ${ROOT}usr/$(get_libdir)/gdesklets/gdesklets-migration-tool"
-	elog "after the first time you run gdesklets"
+	elog "after the first time you run gDesklets"
 	echo
 
 	# This stuff is important, especially the migration-tool
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.1.ebuild
new file mode 100644
index 000000000000..3a8aea9785ed
--- /dev/null
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.1.ebuild,v 1.1 2008/12/30 03:55:44 nixphoeni Exp $
+
+# We want the latest autoconf and automake (the default)
+inherit gnome2 python eutils autotools multilib
+
+MY_PN="gDesklets"
+MY_P="${PN/-core/}-${PV/_/}"
+S="${WORKDIR}/${MY_PN}-${PV/_/}"
+
+DESCRIPTION="GNOME Desktop Applets: Core library for desktop applets"
+SRC_URI="http://gdesklets.de/files/${MY_P}.tar.gz"
+HOMEPAGE="http://www.gdesklets.de"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+# is libgsf needed for runtime or just compiling?
+RDEPEND=">=dev-lang/python-2.3
+	>=dev-libs/glib-2.4
+	gnome-extra/libgsf
+	>=gnome-base/librsvg-2.8
+	>=gnome-base/libgtop-2.8.2
+	>=dev-python/pygtk-2.10
+	>=dev-python/gnome-python-2.6
+	>=dev-libs/expat-1.95.8
+	>=dev-python/pyxml-0.8.3-r1
+	!x11-plugins/desklet-calendar
+	!x11-plugins/desklet-clock"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig
+	dev-util/intltool"
+
+# Parallel makes sometimes break during install phase
+MAKEOPTS="${MAKEOPTS} -j1"
+# Force using MAKEOPTS with emake
+USE_EINSTALL="0"
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+
+	gnome2_src_unpack
+
+	# Postpone pyc compiling until pkg_postinst
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	# Use po/LINGUAS - see gnome bug #506828
+	epatch "${FILESDIR}/${PN}-0.36_beta-linguas.patch"
+	# Install test-control.py - see https://bugs.launchpad.net/gdesklets/+bug/310339
+	epatch "${FILESDIR}/${PN}-${PV}-test-control.py-install-fix.patch"
+
+	eautoreconf
+	intltoolize --force || die
+
+}
+
+src_install() {
+
+	gnome2_src_install
+
+	# Install the gdesklets-control-getid script
+	insinto /usr/$(get_libdir)/gdesklets
+	insopts -m0555
+	doins "${FILESDIR}/gdesklets-control-getid"
+
+	# Remove conflicts with x11-misc/shared-mime-info and auto-generated
+	# MIME info
+	rm -rf 	"${D}/usr/share/mime"
+
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	# Compile pyc files on target system
+	python_mod_optimize "${ROOT}"/usr/$(get_libdir)/gdesklets
+
+	echo
+	elog "gDesklets Displays are required before the library"
+	elog "will be usable.  Core Displays (Calendar, Clock, Quote-of-the-Day,"
+	elog "and the 15pieces game) are already installed in"
+	elog "           ${ROOT}usr/$(get_libdir)/gdesklets/Displays"
+	elog "Additional Displays can be found in -"
+	elog "           x11-plugins/desklet-* ,"
+	elog "at http://www.gdesklets.de, or at http://gdesklets.zencomputer.ca"
+	elog
+	elog "Next you'll need to start gDesklets using"
+	elog "           ${ROOT}usr/bin/gdesklets start"
+	elog "If you're using GNOME this can be done conveniently through"
+	elog "Applications->Accessories->gDesklets"
+	elog
+	elog "If you're updating from a version less than 0.35_rc1,"
+	elog "you can migrate your desklet configurations by"
+	elog "running"
+	elog "           ${ROOT}usr/$(get_libdir)/gdesklets/gdesklets-migration-tool"
+	elog "after the first time you run gDesklets"
+	echo
+
+	# This stuff is important, especially the migration-tool
+	# information which flies by on an update.
+	epause 9
+
+}
+
+pkg_postrm() {
+
+	gnome2_pkg_postrm
+	# Cleanup after our cavalier python compilation
+	# The function takes care of ${ROOT} for us
+	python_mod_cleanup /usr/$(get_libdir)/gdesklets
+
+}