diff options
author | Joe Sapp <nixphoeni@gentoo.org> | 2008-03-26 02:34:27 +0000 |
---|---|---|
committer | Joe Sapp <nixphoeni@gentoo.org> | 2008-03-26 02:34:27 +0000 |
commit | decf7d65c39d332b7ada497c7b718addab90ecec (patch) | |
tree | a3eb1027c0de06afb335353afc8866bd7e6d206f /gnome-extra/gdesklets-core | |
parent | stable ppc, bug 214767 (diff) | |
download | gentoo-2-decf7d65c39d332b7ada497c7b718addab90ecec.tar.gz gentoo-2-decf7d65c39d332b7ada497c7b718addab90ecec.tar.bz2 gentoo-2-decf7d65c39d332b7ada497c7b718addab90ecec.zip |
Version bump and removal of 0.36_beta. Fixed bug #211290 and parallel make issue.
(Portage version: 2.1.4.4)
Diffstat (limited to 'gnome-extra/gdesklets-core')
-rw-r--r-- | gnome-extra/gdesklets-core/ChangeLog | 12 | ||||
-rw-r--r-- | gnome-extra/gdesklets-core/files/gdesklets-core-0.36_beta-binary_link_fix.patch | 22 | ||||
-rw-r--r-- | gnome-extra/gdesklets-core/files/gdesklets-core-0.36_beta-linguas.patch | 74 | ||||
-rw-r--r-- | gnome-extra/gdesklets-core/gdesklets-core-0.36.ebuild (renamed from gnome-extra/gdesklets-core/gdesklets-core-0.36_beta.ebuild) | 31 |
4 files changed, 23 insertions, 116 deletions
diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog index 4c74d697278e..cb9576bb07cb 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.82 2008/02/17 22:12:16 nixphoeni Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.83 2008/03/26 02:34:27 nixphoeni Exp $ + +*gdesklets-core-0.36 (26 Mar 2008) + + 26 Mar 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, +gdesklets-core-0.36.ebuild: + Version bump and removal of beta package (see package ChangeLog for + details). Bump includes resolution of bug #211290 and resolution + of problems during 'install' phase due to parallel makes. *gdesklets-core-0.36_beta (17 Feb 2008) 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 deleted file mode 100644 index 4f01d4f1ae56..000000000000 --- a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36_beta-binary_link_fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 deleted file mode 100644 index ac96d44b4921..000000000000 --- a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36_beta-linguas.patch +++ /dev/null @@ -1,74 +0,0 @@ -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.ebuild index 94ad97563c4c..6abefe072ebf 100644 --- a/gnome-extra/gdesklets-core/gdesklets-core-0.36_beta.ebuild +++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.ebuild @@ -1,16 +1,16 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.ebuild,v 1.1 2008/03/26 02:34:27 nixphoeni Exp $ # We want the latest autoconf and automake (the default) inherit gnome2 eutils autotools multilib -MY_PN="gDesklets" +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" +SRC_URI="http://gdesklets.de/files/${MY_P}.tar.bz2" HOMEPAGE="http://www.gdesklets.de" LICENSE="GPL-2" @@ -34,23 +34,16 @@ DEPEND="${RDEPEND} dev-util/pkgconfig dev-util/intltool" -USE_DESTDIR="1" +# 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 - - 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 @@ -61,14 +54,14 @@ src_install() { # Create a global directory for Displays dodir /usr/$(get_libdir)/gdesklets/Displays + # Remove conflicts with x11-misc/shared-mime-info and auto-generated + # MIME info + rm -rf "${D}/usr/share/mime" + } 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 |