Bumped rev and removed doc useflag - see ChangeLog for details

Package-Manager: portage-2.1.4.4

5 files changed, 213 insertions, 3 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 211743d72ba5..4c74d697278e 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for gnome-extra/gdesklets-core
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.81 2007/12/12 19:44:59 nixphoeni Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.82 2008/02/17 22:12:16 nixphoeni Exp $
+
+*gdesklets-core-0.36_beta (17 Feb 2008)
+
+  17 Feb 2008; Joe Sapp <nixphoeni@gentoo.org>
+  +files/gdesklets-core-0.36_beta-binary_link_fix.patch,
+  +files/gdesklets-core-0.36_beta-linguas.patch,
+  +gdesklets-core-0.36_beta.ebuild:
+  Removed doc useflag (haven't rebuilt the develbook for this release)
+  Updated pygtk dep
+  Included patches to use po/LINGUAS and generate the correct symlink for
+  the main binary (see bug #195312 - thanks in large part to Gilles
+  Dartiguelongue for generating and linking)
+  Remove all potential conflicts with /usr/share/mime
+  Let the makefile install the man page
 
   12 Dec 2007; Joe Sapp <nixphoeni@gentoo.org>
   files/gdesklets-displays.desktop:
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
index 1b1673e8c942..1e7b27dfc5fa 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -3,11 +3,14 @@ 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_beta-binary_link_fix.patch 821 RMD160 3a3333166551d5c00dafc83ba283181405cea565 SHA1 06f21fbcfc5eee755169c8220f33fdc80d2bc603 SHA256 b0e30d0ffc32dcbed39af2bc66edea90c97c6dcd359ca9a10711c72442050604
+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.36beta.tar.bz2 760681 RMD160 9051b0edfb8fd619e7aa9c253d9b647efc714364 SHA1 ad54e316fc05e18fbfe830f4194bba306919486d SHA256 31216af418fd2c9bef0bff893262664a4244c19e4befdbf2b7a402df67bb9233
 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
@@ -15,5 +18,6 @@ EBUILD gdesklets-core-0.35.2-r1.ebuild 2711 RMD160 f475048360bf062a57a8465fbfb4e
 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 2976 RMD160 2c93c19b44b57492e808fb1224ab654a150c6f1e SHA1 1aef05b1653ae559ba792cd03ecf00a4e85ccc5b SHA256 5005018c77b9bb658bc06e45dce53400304b1eb7e9a08e72385ecec6d060b043
-MISC ChangeLog 14721 RMD160 aa6ea0348098ed211f82964475b0340e294462fe SHA1 3c38b0baaf8a0914a6032fe56ac8fa19b74827ec SHA256 7b392b5a77143d32380335b06488f3f41549a7705e4ae22f5658c646d79f75d5
+EBUILD gdesklets-core-0.36_beta.ebuild 2625 RMD160 bae246e11df0c005f15cd959cd1356d5b2228f35 SHA1 dbc6fd68631350b13106c465f935d16d0b81164e SHA256 42971051303e912bcfb38841d9db725d2a68f0f83fdd911162066d5ac0dcc9f8
+MISC ChangeLog 15324 RMD160 6fbfb386e3d7f57876f6ab55f3f8c66d77ed9481 SHA1 b3a074998dcf1c1f5f6746649ba9a719fda98b08 SHA256 1b6de5ff08f041c5edbbd2074ad8a5d21e164645c654efc52c9e5fe4f1c5cabd
 MISC metadata.xml 225 RMD160 84ee2a2d6e82c97c9059ca7cfc17f222f18e4431 SHA1 54492f0c3ac21555e1a60882fa7b92103fc3d2c8 SHA256 49feb5b4f0a008e92acb1626adf763199e38ad92f465e41943a89941213ffeef
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36_beta-binary_link_fix.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36_beta-binary_link_fix.patch
new file mode 100644
index 000000000000..4f01d4f1ae56
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36_beta-binary_link_fix.patch
@@ -0,0 +1,22 @@
+--- Makefile.am.orig	2008-02-17 11:44:58.000000000 -0500
++++ Makefile.am	2008-02-17 11:47:40.000000000 -0500
+@@ -53,6 +53,5 @@
+ 	fi
+ 
+ 	$(INSTALL_SCRIPT) gdesklets $(DESTDIR)${coredir}/gdesklets; \
+-	cd $(DESTDIR)$(bindir); \
+-	$(LN_S) -f ../../lib/gdesklets gdesklets;
++	$(LN_S) -f ${coredir}/gdesklets $(DESTDIR)$(bindir)/gdesklets;
+ 
+--- Makefile.in.orig	2008-02-17 15:35:29.000000000 -0500
++++ Makefile.in	2008-02-17 15:36:41.000000000 -0500
+@@ -766,8 +766,7 @@
+ 	fi
+ 
+ 	$(INSTALL_SCRIPT) gdesklets $(DESTDIR)${coredir}/gdesklets; \
+-	cd $(DESTDIR)$(bindir); \
+-	$(LN_S) -f ../../lib/gdesklets gdesklets;
++	$(LN_S) -f ${coredir}/gdesklets $(DESTDIR)$(bindir)/gdesklets;
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36_beta-linguas.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36_beta-linguas.patch
new file mode 100644
index 000000000000..ac96d44b4921
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36_beta-linguas.patch
@@ -0,0 +1,74 @@
+Index: po/LINGUAS
+===================================================================
+--- po/LINGUAS	(révision 0)
++++ po/LINGUAS	(révision 0)
+@@ -0,0 +1,47 @@
++# please keep this list sorted alphabetically
++#
++ar
++az
++bg
++ca
++cs
++de
++dz
++el 
++en_CA
++en_GB
++es
++eu
++fi
++fr
++gl
++he
++hr
++hu
++is
++it
++ja
++ko
++lt
++lv
++ms
++nb
++ne
++nl
++oc
++pa
++pl
++pt
++pt_BR
++ru
++rw
++sq
++sr
++sr@Latn
++sv
++tr
++uk
++vi
++zh_CN
++zh_HK
++zh_TW
+Index: configure.in
+===================================================================
+--- configure.in	(révision 3591)
++++ configure.in	(copie de travail)
+@@ -11,7 +11,7 @@
+ AC_PROG_CXX(gcc cc)
+ AC_HEADER_STDC
+ AC_DISABLE_STATIC
+-AC_PROG_INTLTOOL
++IT_PROG_INTLTOOL([0.35.0])
+ AC_PROG_INSTALL
+ AC_PROG_LIBTOOL
+ AC_PROG_LN_S
+@@ -88,8 +88,6 @@
+ AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database)
+ AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database)
+ 
+-ALL_LINGUAS="ar az bg ca cs de dz el en_CA en_GB es eu fi fr gl he hr hu is it ja ko lt lv ms nb ne nl oc pa pl pt pt_BR ru rw sq sr sr@Latn sv tr uk vi zh_CN zh_HK zh_TW"
+-AC_SUBST(ALL_LINGUAS)
+ GETTEXT_PACKAGE=gdesklets
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36_beta.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36_beta.ebuild
new file mode 100644
index 000000000000..94ad97563c4c
--- /dev/null
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36_beta.ebuild
@@ -0,0 +1,96 @@
+# 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_beta.ebuild,v 1.1 2008/02/17 22:12:16 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://students.fim.uni-passau.de/~meyerc/gDesklets/${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"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig
+	dev-util/intltool"
+
+USE_DESTDIR="1"
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+
+	gnome2_src_unpack
+
+	cd "${S}"
+	# Use po/LINGUAS - see gnome bug #506828
+	epatch "${FILESDIR}/${P}-linguas.patch"
+	# Fix the creation of the /usr/bin/gdesklets link to respect libdir
+	epatch "${FILESDIR}/${P}-binary_link_fix.patch"
+
+}
+
+src_install() {
+
+	gnome2_src_install
+
+	# Install the gdesklets-control-getid script
+	insinto /usr/$(get_libdir)/gdesklets
+	insopts -m0555
+	doins "${FILESDIR}/gdesklets-control-getid"
+
+	# Create a global directory for Displays
+	dodir /usr/$(get_libdir)/gdesklets/Displays
+
+}
+
+pkg_postinst() {
+
+	# Remove conflicts with x11-misc/shared-mime-info and auto-generated
+	# MIME info
+	rm -rf 	"${D}/usr/share/mime/"
+
+	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
+
+}