summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Sapp <nixphoeni@gentoo.org>2011-01-30 21:00:25 +0000
committerJoe Sapp <nixphoeni@gentoo.org>2011-01-30 21:00:25 +0000
commit999395cf56ba98e9525fa84780b78f1d172913bf (patch)
tree332e8f8094e9303cc0265056ca8dc668d1c75a3b /gnome-extra/gdesklets-core
parentAdded more upstream fixes. Switched to EAPI=4. Added static-libs flag, force ... (diff)
downloadgentoo-2-999395cf56ba98e9525fa84780b78f1d172913bf.tar.gz
gentoo-2-999395cf56ba98e9525fa84780b78f1d172913bf.tar.bz2
gentoo-2-999395cf56ba98e9525fa84780b78f1d172913bf.zip
Added patch to not install .in files
(Portage version: 2.1.9.35/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra/gdesklets-core')
-rw-r--r--gnome-extra/gdesklets-core/ChangeLog6
-rw-r--r--gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch41
-rw-r--r--gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r1.ebuild4
3 files changed, 49 insertions, 2 deletions
diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 9d26b1338345..e364cd825870 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,10 @@
# 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.138 2011/01/29 02:38:25 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.139 2011/01/30 21:00:25 nixphoeni Exp $
+
+ 30 Jan 2011; Joe Sapp <nixphoeni@gentoo.org> gdesklets-core-0.36.3-r1.ebuild,
+ +files/gdesklets-core-0.36.3-.in-files.patch:
+ Added patch to not install .in files
*gdesklets-core-0.36.3-r1 (29 Jan 2011)
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch
new file mode 100644
index 000000000000..adda7bd12820
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch
@@ -0,0 +1,41 @@
+=== modified file 'Makefile_gdesklets.am'
+--- Makefile_gdesklets.am 2011-01-06 11:01:06 +0000
++++ Makefile_gdesklets.am 2011-01-30 20:12:07 +0000
+@@ -20,28 +20,31 @@
+
+ dist_man_MANS = doc/man/gdesklets.1
+
++# The .desktop file
++desktop_in_files = data/gdesklets.desktop.in
++# The shared mime XML file
++sharedmimepackage_in_files = data/gdesklets.xml.in
++
+ EXTRA_DIST = \
+ AUTHORS \
+ COPYING \
+ README \
+ TODO \
+ NEWS \
+- contrib/bash/gdesklets
++ contrib/bash/gdesklets \
++ $(desktop_in_files) \
++ $(sharedmimepackage_in_files)
+
+ # See http://www.gnu.org/software/hello/manual/automake/Clean.html
+ CLEANFILES = \
+ po/.intltool-merge-cache
+
+ # The .desktop file
+-desktop_in_files = data/gdesklets.desktop.in
+-dist_desktop_DATA= $(desktop_in_files)
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ autostart_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+
+ # The shared mime XML file
+-sharedmimepackage_in_files = data/gdesklets.xml.in
+-dist_sharedmimepackage_DATA = $(sharedmimepackage_in_files)
+ sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml)
+ @INTLTOOL_XML_RULE@
+
+
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r1.ebuild
index 25de6c5eaf60..614fb3d5a8ce 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r1.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r1.ebuild
@@ -1,6 +1,6 @@
# 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-r1.ebuild,v 1.1 2011/01/29 02:38:25 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r1.ebuild,v 1.2 2011/01/30 21:00:25 nixphoeni Exp $
EAPI=2
# desklets don't run with USE=debug
@@ -22,6 +22,7 @@ SLOT="0"
IUSE=""
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
@@ -51,6 +52,7 @@ pkg_setup() {
src_prepare() {
+ epatch "${FILESDIR}/${P}-.in-files.patch"
gnome2_src_prepare
# Postpone pyc compiling until pkg_postinst