summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Bickel <mabi@gentoo.org>2007-04-30 16:04:17 +0000
committerMatti Bickel <mabi@gentoo.org>2007-04-30 16:04:17 +0000
commit05da24d4a9705b8d201c2b5c481c55e432b92295 (patch)
tree1e569bea09c711693c4817b94ede381c2f0866dd /x11-wm/ion3
parentFix bug #176596 for 3.2.1-r1; revbump that depends on split-ant and links who... (diff)
downloadgentoo-2-05da24d4a9705b8d201c2b5c481c55e432b92295.tar.gz
gentoo-2-05da24d4a9705b8d201c2b5c481c55e432b92295.tar.bz2
gentoo-2-05da24d4a9705b8d201c2b5c481c55e432b92295.zip
patch --as-needed instead of filtering it (bug #171391)
(Portage version: 2.1.2.4)
Diffstat (limited to 'x11-wm/ion3')
-rw-r--r--x11-wm/ion3/ChangeLog9
-rw-r--r--x11-wm/ion3/files/20070318/208_all_as-needed.patch12
-rw-r--r--x11-wm/ion3/files/digest-ion3-20070318-r2 (renamed from x11-wm/ion3/files/digest-ion3-20070318-r1)0
-rw-r--r--x11-wm/ion3/ion3-20070318-r2.ebuild (renamed from x11-wm/ion3/ion3-20070318-r1.ebuild)5
4 files changed, 21 insertions, 5 deletions
diff --git a/x11-wm/ion3/ChangeLog b/x11-wm/ion3/ChangeLog
index c720fa464a5d..97162c5ea0fd 100644
--- a/x11-wm/ion3/ChangeLog
+++ b/x11-wm/ion3/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for x11-wm/ion3
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.48 2007/04/28 21:52:22 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.49 2007/04/30 16:04:17 mabi Exp $
+
+*ion3-20070318-r2 (30 Apr 2007)
+
+ 30 Apr 2007; Matti Bickel <mabi@gentoo.org>
+ +files/20070318/208_all_as-needed.patch, -ion3-20070318-r1.ebuild,
+ +ion3-20070318-r2.ebuild:
+ patch --as-needed instead of filtering it (bug #171391)
*ion3-20070318-r1 (28 Apr 2007)
diff --git a/x11-wm/ion3/files/20070318/208_all_as-needed.patch b/x11-wm/ion3/files/20070318/208_all_as-needed.patch
new file mode 100644
index 000000000000..662a078df303
--- /dev/null
+++ b/x11-wm/ion3/files/20070318/208_all_as-needed.patch
@@ -0,0 +1,12 @@
+diff -uNr ion-3ds-20070318.orig/de/Makefile ion-3ds-20070318/de/Makefile
+--- ion-3ds-20070318.orig/de/Makefile 2007-03-18 21:31:37.000000000 +0100
++++ ion-3ds-20070318/de/Makefile 2007-04-30 17:30:23.000000000 +0200
+@@ -17,6 +17,8 @@
+
+ MAKE_EXPORTS=de
+
++LDFLAGS+=-lXext
++
+ ######################################
+
+ include $(TOPDIR)/build/rules.mk
diff --git a/x11-wm/ion3/files/digest-ion3-20070318-r1 b/x11-wm/ion3/files/digest-ion3-20070318-r2
index b233dc82b4c2..b233dc82b4c2 100644
--- a/x11-wm/ion3/files/digest-ion3-20070318-r1
+++ b/x11-wm/ion3/files/digest-ion3-20070318-r2
diff --git a/x11-wm/ion3/ion3-20070318-r1.ebuild b/x11-wm/ion3/ion3-20070318-r2.ebuild
index 1605e04da4c3..ede686cc5141 100644
--- a/x11-wm/ion3/ion3-20070318-r1.ebuild
+++ b/x11-wm/ion3/ion3-20070318-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20070318-r1.ebuild,v 1.1 2007/04/28 21:52:22 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20070318-r2.ebuild,v 1.1 2007/04/30 16:04:17 mabi Exp $
inherit eutils flag-o-matic
@@ -59,7 +59,6 @@ src_unpack() {
EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" epatch
use iontruetype && epatch ${FILESDIR}/xft-ion3-${PV}.patch
-
# Rewrite install directories to be prefixed by DESTDIR for sake of portage's sandbox
sed -i 's!\($(INSTALL\w*)\|rm -f\|ln -s\)\(.*\)\($(\w\+DIR)\)!\1\2$(DESTDIR)\3!g' Makefile */Makefile */*/Makefile build/rules.mk
@@ -97,8 +96,6 @@ src_unpack() {
src_compile() {
local myconf=""
- filter-ldflags "-Wl,--as-needed"
-
myconf="${myconf} `use_enable iontruetype xft`"
# xfree