summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Shakaryan <omp@gentoo.org>2008-01-06 08:57:22 +0000
committerDavid Shakaryan <omp@gentoo.org>2008-01-06 08:57:22 +0000
commitc3139eb6dc98674e9c3219f014e7aa1ed0484567 (patch)
treec413441d135da5aea61226b4fcd7e31ad362d739 /x11-themes
parentremoving asterisk and zaptel 1.0. (diff)
downloadgentoo-2-c3139eb6dc98674e9c3219f014e7aa1ed0484567.tar.gz
gentoo-2-c3139eb6dc98674e9c3219f014e7aa1ed0484567.tar.bz2
gentoo-2-c3139eb6dc98674e9c3219f014e7aa1ed0484567.zip
Patch by Jaroslaw Kalinowski to fix build error. (bug #150623)
(Portage version: 2.1.4_rc11)
Diffstat (limited to 'x11-themes')
-rw-r--r--x11-themes/fvwm-themes/ChangeLog8
-rw-r--r--x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo1.patch28
-rw-r--r--x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild18
3 files changed, 44 insertions, 10 deletions
diff --git a/x11-themes/fvwm-themes/ChangeLog b/x11-themes/fvwm-themes/ChangeLog
index bc9e52ea18e3..cd28cdd7fb8d 100644
--- a/x11-themes/fvwm-themes/ChangeLog
+++ b/x11-themes/fvwm-themes/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-themes/fvwm-themes
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/ChangeLog,v 1.16 2006/07/08 08:40:31 corsair Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/ChangeLog,v 1.17 2008/01/06 08:57:22 omp Exp $
+
+ 06 Jan 2008; David Shakaryan <omp@gentoo.org>
+ +files/fvwm-themes-0.7.0-gentoo1.patch, fvwm-themes-0.7.0.ebuild:
+ Patch by Jaroslaw Kalinowski to fix build error. (bug #150623)
08 Jul 2006; Markus Rothe <corsair@gentoo.org> fvwm-themes-0.7.0.ebuild:
Stable on ppc64
diff --git a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo1.patch b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo1.patch
new file mode 100644
index 000000000000..04d83f4ad98c
--- /dev/null
+++ b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo1.patch
@@ -0,0 +1,28 @@
+--- Makefile.in.orig 2007-11-05 22:50:39.000000000 +0100
++++ Makefile.in 2007-11-05 22:57:22.000000000 +0100
+@@ -462,25 +462,6 @@
+ $(DESTDIR)$(SETTINGS_FILE) > $(DESTDIR)$(SETTINGS_FILE).tmp && \
+ mv -f $(DESTDIR)$(SETTINGS_FILE).tmp $(DESTDIR)$(SETTINGS_FILE)
+
+- PATH="$(DESTDIR)$(bindir):$(FVWM_BINDIR):$$PATH"; \
+- $(DESTDIR)$(bindir)/fvwm-themes-config --site --reset
+-
+- if test "$(BUILD_MENUS)" = "yes"; then \
+- $(DESTDIR)$(bindir)/fvwm-themes-menuapp --site --build-menus --remove-popup; \
+- fi
+-
+- if test "$(GNOME_ICONS)" = "yes"; then \
+- $(DESTDIR)$(bindir)/fvwm-themes-images --ft-install --gnome; \
+- fi
+-
+- if test "$(KDE2_ICONS)" = "yes"; then \
+- $(DESTDIR)$(bindir)/fvwm-themes-images --ft-install --kde2; \
+- fi
+-
+- if test "$(RUN_UPDATEMENU)" = "yes"; then \
+- $(UPDATE_MENU); \
+- fi
+-
+ @echo
+ @echo ------------------------------------------------------------------------------
+ @echo "fvwm-themes is successfully installed."
diff --git a/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild b/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild
index de6d348770da..a8d0b9b4b7e4 100644
--- a/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild
+++ b/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild,v 1.15 2007/07/12 07:35:24 mr_bones_ Exp $
-
-IUSE="gnome"
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild,v 1.16 2008/01/06 08:57:22 omp Exp $
inherit eutils
DESCRIPTION="A configuration framework for the fvwm window manager"
HOMEPAGE="http://fvwm-themes.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fvwm-themes/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE="gnome"
DEPEND=">=x11-wm/fvwm-2.5.8
gnome? ( media-gfx/imagemagick )"
@@ -20,8 +20,10 @@ RDEPEND="x11-wm/fvwm"
src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}"/${P}-gentoo.patch
- epatch "${FILESDIR}"/${P}-posix-sort.patch
+
+ epatch "${FILESDIR}/${P}-gentoo.patch"
+ epatch "${FILESDIR}/${P}-gentoo1.patch"
+ epatch "${FILESDIR}/${P}-posix-sort.patch"
}
src_compile() {