Added patch to honor CFLAGS (bug #361377); added USE flag to pull in python-dbus if dbus support is requested

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

5 files changed, 179 insertions, 3 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index dfea5de8d1e3..d53de310d3ac 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.140 2011/02/03 02:40:46 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.141 2011/04/08 12:13:53 nixphoeni Exp $
+
+*gdesklets-core-0.36.3-r3 (08 Apr 2011)
+
+  08 Apr 2011; Joe Sapp <nixphoeni@gentoo.org>
+  +gdesklets-core-0.36.3-r3.ebuild, +files/gdesklets-core-0.36.3-CFLAGS.patch:
+  Added patch to honor CFLAGS (bug #361377); added USE flag to pull in
+  python-dbus if dbus support is requested; added blurb about dbus USE flag
+  to metadata
 
 *gdesklets-core-0.36.3-r2 (03 Feb 2011)
 
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
index 0a48f282c797..b5751c92ba5c 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -4,6 +4,7 @@ AUX gdesklets-core-0.36.1-bash-completion 1425 RMD160 87724e2766e3d9ece61051b146
 AUX gdesklets-core-0.36.1-test-control.py-install-fix.patch 483 RMD160 a3a0b625c92738bb99d19f1332ded97fe717d387 SHA1 b088909f190a39479515b9501918fb7e31a03903 SHA256 2d3ef43385c3e2eb506a714ece81768abe6500f58392514a4b1e327bf098625d
 AUX gdesklets-core-0.36.2-ConfigWidget-dupe-fix.patch 312 RMD160 f37835015fb90857ee53b4001c53ccf1efd3bb08 SHA1 d51901a750bf901d5428734b79280c30d6b6f201 SHA256 eec96d7fa8c17b4c9a6ec037bc8ac8c4165c5bc652a35cceddd4ad13e97c0dfa
 AUX gdesklets-core-0.36.3-.in-files.patch 5186 RMD160 9c5fac538853f625d103ef07d34e90419cb03e84 SHA1 f0176794ef4ba93ba7160464df9b813f71f0188e SHA256 eeb4f3caf962e1c454b2054d7390bfdec641111741a9915238d949e169ee5530
+AUX gdesklets-core-0.36.3-CFLAGS.patch 1091 RMD160 04837984101cc1ed089a0ea5a3504566fdbc9208 SHA1 1fc4e943bcb7f91d25e16095aad9b1d0e9d8aa80 SHA256 8a1e813adc30a16a4a5fc57f724a348f436c59189cf8dba91c6bbca2ac1ea78a
 AUX gdesklets-core-0.36_beta-linguas.patch 1208 RMD160 5b691f445e73316232e394b8dca91601ac57d706 SHA1 d9fe4ed5775921c772b00399f3479afbb4a184d9 SHA256 760a79c3df6c6680ea6b76d787f666a603c919f7fac6b22869a4cb6ab7023b4b
 AUX gdesklets-core-getid-fix.patch 580 RMD160 d2be1e31658768b9d34d7500f9b6b76d524cec87 SHA1 b54a6a7b06b8634f9d07c0d98662db0164814ca5 SHA256 2be4b77748dc3ac89ad9709ff5f1fd014b78a4468542fad93183df539d77016a
 AUX gdesklets.desktop 265 RMD160 a6a84a28abf1120cc8df2e52505c119cdb82cca7 SHA1 a8a544d457cf613f939c45e29681bab307b0fa36 SHA256 8b38972217e4a923fb988b7982eb1e6655f1f885686a4b9585810999588c11ee
@@ -13,5 +14,6 @@ DIST gdesklets-0.36.3.tar.bz2 3745626 RMD160 86da28930621071fca32d2bc9c0ebfe1a41
 EBUILD gdesklets-core-0.36.1-r3.ebuild 3892 RMD160 d16f6037e98d2073b2ceef694fb232d71820112c SHA1 f1ddc5a5cf0a2dc5f08507b7c1b939e5b7fb252b SHA256 2f82efafe8e5caf32f00db20bea53f592a6d11897eecb8d10bb6c399c36b01de
 EBUILD gdesklets-core-0.36.2-r3.ebuild 3696 RMD160 bea9dac2a45b42e92828a0a5fbf92086657c6cb8 SHA1 f4d8435a870d5388f0f4364ba04a6a4b82e30b0e SHA256 047723c3966e006339c4e80a236cc4d28d88520f93dcf26c0b04a26b776caf52
 EBUILD gdesklets-core-0.36.3-r2.ebuild 3406 RMD160 62610835a2dc4e445cdfaa277a61ad75393ce415 SHA1 864ef976b2c59dd1e03c21b9c284722f69e8ec83 SHA256 d5027ab742540b6dc61dbb429085b16e5da84f9b1a79b7dfb7815d44c4cf726a
-MISC ChangeLog 26233 RMD160 28ffad851b3317ab7dbee51f169fa2b5464d4b91 SHA1 b2f47b46c8ab3e979a6139e931887be8e76df3a5 SHA256 2e9712fa4d0b7b40a0d6db0411cb0a2d43aff6a68ba79f4e789d4086de5c456b
-MISC metadata.xml 313 RMD160 a292cb05998c995298fead8eda4d51d81832fd97 SHA1 ec75a2fe8a0668f263858cf395321641d839e968 SHA256 d913b0c409eb9c0725471cd13f4ed893899f5a09881dfef10dea6cd658a7aad9
+EBUILD gdesklets-core-0.36.3-r3.ebuild 3480 RMD160 bef840b596470e5a98cecca2b3b6e5e40769993c SHA1 bb872e10d95031b6267040ac4181dc677b2326ab SHA256 9485c1fc0ba5f81ff5586a3c2261dab4c13c97028ae6ea6137f66ccacb43b36a
+MISC ChangeLog 26562 RMD160 9ff323ce1fa12bc1878f4f9babf1b0bee7f67a39 SHA1 d75bd644d651da30f06d2f35988b4ca725d603aa SHA256 eb6115989462f1ed5ca8f10a239b210b477e159f3bf0968e43540b3eeacfc42e
+MISC metadata.xml 393 RMD160 e2b43a43703079b731adbfe7ef2d112265b9fdaf SHA1 36dc36c90800e7d73ec015f5d92da2822c6f3b25 SHA256 b4b0b139bfb5f5f2b03813fc571937bf021bdf7d158d26816ffab10aa654f5cc
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-CFLAGS.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-CFLAGS.patch
new file mode 100644
index 000000000000..3abfb08b8ec0
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-CFLAGS.patch
@@ -0,0 +1,37 @@
+=== modified file 'configure.ac'
+--- configure.ac	2011-02-15 10:13:11 +0000
++++ configure.ac	2011-04-08 01:27:57 +0000
+@@ -9,6 +9,7 @@
+ AC_CONFIG_MACRO_DIR([macros])
+ AC_CONFIG_FILES([Makefile])
+ AM_MAINTAINER_MODE
++: ${CFLAGS="-Os -g"}
+ 
+ dnl Required programs
+ AC_PROG_CC
+@@ -21,14 +22,12 @@
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ 
+-CFLAGS="-Os -g"
+-
+ AC_ARG_ENABLE(debug,AS_HELP_STRING([--enable-debug],[Maximum debugging]),
+               set_debug="$enableval",[set_debug=no])
+ AC_MSG_CHECKING(for more debugging including macro expansion)
+ if test "$GCC" = "yes" -a "$set_debug" != "no"; then
+   AC_MSG_RESULT(yes)
+-  CFLAGS="-O0 -g3"
++  CFLAGS="$CFLAGS -O0 -g3"
+ else
+   AC_MSG_RESULT(no)
+ fi
+@@ -39,7 +38,7 @@
+ AC_MSG_CHECKING(for more warnings, including -Werror)
+ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
+     AC_MSG_RESULT(yes)
+-    CFLAGS="\
++    CFLAGS="$CFLAGS \
+     -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
+     -Wmissing-declarations -Wredundant-decls -Wunreachable-code \
+     -Wpointer-arith -Wcast-align -Wsign-compare -ansi \
+
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild
new file mode 100644
index 000000000000..85592237c0dd
--- /dev/null
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2011 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.3-r3.ebuild,v 1.1 2011/04/08 12:13:53 nixphoeni Exp $
+
+EAPI=2
+# desklets don't run with USE=debug
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.4"
+
+inherit gnome2 python eutils autotools multilib bash-completion
+
+MY_PN="${PN/-core}"
+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://gdesklets.de"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="dbus"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# is libgsf needed for runtime or just compiling?
+RDEPEND=">=dev-libs/glib-2.4
+	>=gnome-base/librsvg-2.8
+	>=gnome-base/libgtop-2.8.2
+	>=dev-python/pygtk-2.10
+	>=dev-python/libbonobo-python-2.6
+	>=dev-python/gconf-python-2.6
+	>=dev-python/pygobject-2.6
+	>=dev-python/pyorbit-2.0.1
+	|| ( >=dev-python/gnome-vfs-python-2.6 >=dev-python/libgnome-python-2.6 )
+	>=dev-libs/expat-1.95.8
+	>=dev-python/pyxml-0.8.3-r1
+	dbus? ( dev-python/dbus-python )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig
+	dev-util/intltool"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+CONVERT_SHEBANGS="ctrlinfo gdesklets gdesklets-daemon gdesklets-logview \
+	gdesklets-shell test-control.py contrib/gdesklets-migration-tool"
+
+pkg_setup() {
+
+	python_set_active_version 2
+
+}
+
+src_prepare() {
+
+	epatch "${FILESDIR}/${P}-.in-files.patch"
+	epatch "${FILESDIR}/${P}-CFLAGS.patch"
+	gnome2_src_prepare
+
+	# Postpone pyc compiling until pkg_postinst
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	eautoreconf
+	intltoolize --force || die
+
+	python_convert_shebangs 2 ${CONVERT_SHEBANGS}
+
+}
+
+src_install() {
+
+	gnome2_src_install
+
+	# Install bash completion script
+	BASHCOMPLETION_NAME="gDesklets" \
+		dobashcompletion "contrib/bash/gdesklets"
+
+	# Install the gdesklets-control-getid script
+	insinto "/usr/$(get_libdir)/gdesklets"
+	insopts -m0555
+	doins "${FILESDIR}/gdesklets-control-getid"
+
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+	python_need_rebuild
+	# Compile pyc files on target system
+	python_mod_optimize "/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://archive.gdesklets.info"
+	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 or automatically each login"
+	elog "under System->Preferences->Sessions"
+	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/contrib/gdesklets-migration-tool"
+	elog "after the first time you run gDesklets"
+	elog
+
+	BASHCOMPLETION_NAME="gDesklets" bash-completion_pkg_postinst
+
+}
+
+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"
+
+}
diff --git a/gnome-extra/gdesklets-core/metadata.xml b/gnome-extra/gdesklets-core/metadata.xml
index 7b6febd0160e..653d59246ee1 100644
--- a/gnome-extra/gdesklets-core/metadata.xml
+++ b/gnome-extra/gdesklets-core/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<bugs-to>https://bugs.launchpad.net/gdesklets</bugs-to>
 	</upstream>
+	<use>
+		<flag name='dbus'>Enable gDesklets Controls to use DBus</flag>
+	</use>
 </pkgmetadata>