Using the LINGUAS patch from 0.36_beta (bug 215538). Added blockers for colliding desklets (bug 215662).

(Portage version: 2.1.5_rc5)

2 files changed, 109 insertions, 1 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 24f0bdca2842..92e05a95e76f 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,16 @@
 # 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.84 2008/03/26 02:39:59 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.85 2008/04/20 05:08:54 nixphoeni Exp $
+
+*gdesklets-core-0.36-r1 (20 Apr 2008)
+
+  20 Apr 2008; Joe Sapp <nixphoeni@gentoo.org>
+  +gdesklets-core-0.36-r1.ebuild:
+  Added blockers for desklet-calendar and desklet-clock as those desklets
+  are now included in the core package. The LINGUAS patch from 0.36_beta is
+  still needed (thanks bug 215538). The global Displays directory no longer
+  needs to be created. Thanks to Iain for reporting bug 215662 and eva for
+  the note about the desklets now included in the code package.
 
   26 Mar 2008; Joe Sapp <nixphoeni@gentoo.org> -files/dst-fix-0.34.3.patch:
   Cleanup - removed an old patch
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild
new file mode 100644
index 000000000000..a1cc0335bb23
--- /dev/null
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild
@@ -0,0 +1,98 @@
+# 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.1 2008/04/20 05:08:54 nixphoeni Exp $
+
+# We want the latest autoconf and automake (the default)
+inherit gnome2 eutils autotools multilib
+
+MY_PN="gdesklets"
+MY_P="${MY_PN}-${PV/_/}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="GNOME Desktop Applets: Core library for desktop applets"
+SRC_URI="http://gdesklets.de/files/${MY_P}.tar.bz2"
+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
+
+	# Use po/LINGUAS - see gnome bug #506828
+	epatch "${FILESDIR}/${PN}-0.36_beta-linguas.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
+
+	echo
+	elog "gDesklets Displays are required before the library"
+	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 "           ${ROOT}usr/bin/gdesklets start"
+	elog "If you're using GNOME this can be done conveniently"
+	elog "through 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
+
+}