remove gtk2 flag #106560

Package-Manager: portage-2.0.51.19

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index cc741ef2a2de5b43475bbec5000830669645d21f..c8e2ec103b14daa04054681923a696d7ba310831 100644 (file)
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.100 2005/08/28 20:19:12 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.101 2005/09/21 08:28:01 taviso Exp $
+
+*fvwm-2.5.14 (21 Sep 2005)
+
+  21 Sep 2005; Tavis Ormandy <taviso@gentoo.org> +fvwm-2.5.14-r1.ebuild,
+  -fvwm-2.5.14.ebuild:
+  remove gtk2 flag #106560
 
   28 Aug 2005; Tavis Ormandy <taviso@gentoo.org> :
   bump, use -fno-strict-aliasing as recommended by upstream.

diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index b0d6c71abcf14cf0f37d9edadd7904753b4294ff..1d62a88e52b6ff7eb65524f883c13b3bf6d3d0a4 100644 (file)
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,18 +1,18 @@
 MD5 cfc37d7eb6be1a5a71178973ca1a2e3f fvwm-2.5.13-r1.ebuild 7864
 MD5 d4ad99d2edb49ee23de8acb401f8ba0c fvwm-2.5.12.ebuild 8960
-MD5 da4719f7566ca15947e15dda23cbbf48 fvwm-2.5.14.ebuild 7774
-MD5 896f0556c9c391e8b36a391f564280f8 ChangeLog 17531
+MD5 0dcc3be54b816d4ff673d76643c45034 fvwm-2.5.14-r1.ebuild 7555
+MD5 0419a9580abd2c13c81c889161d02fea ChangeLog 17683
 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
 MD5 ba8d61baf42b7f21be2488b3581ff51d fvwm-2.4.18.ebuild 2956
 MD5 d91fb7d2af57653fc93a70e6e1c0a0ea files/fvwm-menu-xlock-xlockmore-compat.diff 550
 MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788
 MD5 7d84c8175928d331e6d7b253679f5654 files/digest-fvwm-2.4.18 65
 MD5 c8fa1c05cdae43bd53f68942d684f23a files/digest-fvwm-2.5.12 209
-MD5 f3538419cf078abb6adb941ee864fbd2 files/digest-fvwm-2.5.14 209
 MD5 a580b9f394262307f85eae492bbd68d9 files/centerplacement-2.5.10.diff 2431
 MD5 38cb0131791d07053b5d90bf21d1993f files/fvwm-translucent-menus.diff.gz 3582
 MD5 0dc5ddac8cf6767f4a753feef77e6c65 files/fvwm-noxbell-grab-fail.diff 360
 MD5 20d3c9bb419ce71c80fd25fd85364a45 files/fvwm-64bit-fixes.diff.gz 12220
 MD5 326a3b450dd43ec75b78fd0058026a3b files/digest-fvwm-2.5.13-r1 209
+MD5 f3538419cf078abb6adb941ee864fbd2 files/digest-fvwm-2.5.14-r1 209
 MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425
 MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419

diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.14 b/x11-wm/fvwm/files/digest-fvwm-2.5.14-r1
similarity index 100%
rename from x11-wm/fvwm/files/digest-fvwm-2.5.14
rename to x11-wm/fvwm/files/digest-fvwm-2.5.14-r1

diff --git a/x11-wm/fvwm/fvwm-2.5.14.ebuild b/x11-wm/fvwm/fvwm-2.5.14-r1.ebuild
similarity index 94%
rename from x11-wm/fvwm/fvwm-2.5.14.ebuild
rename to x11-wm/fvwm/fvwm-2.5.14-r1.ebuild
index 28355628b98f25eb9b5ca9037dd373f0b6161c6b..7f54305f016b8bb0ef34cf6b777b55b260eb9b42 100644 (file)
--- a/x11-wm/fvwm/fvwm-2.5.14.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.14.ebuild,v 1.1 2005/08/28 20:19:12 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.14-r1.ebuild,v 1.1 2005/09/21 08:28:01 taviso Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2
 LICENSE="GPL-2 FVWM"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bidi debug gtk gtk2 imlib nls perl png readline rplay stroke tcltk truetype xinerama"
+IUSE="bidi debug gtk imlib nls perl png readline rplay stroke tcltk truetype xinerama"
 
 RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 )
                gtk? ( =x11-libs/gtk+-1.2*
@@ -155,7 +155,7 @@ src_install() {
 
        if use perl; then
 
-               local toolkits="gtk2 gtk tcltk"
+               local toolkits="gtk tcltk"
 
                if use tcltk; then
                        # Install the very cool FvwmTabs module
@@ -183,14 +183,7 @@ src_install() {
                        # Remove gtk bindings (requires gtk-perl/gtk2-perl)
                        rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm \
                                ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm
-                       toolkits=${toolkits/gtk2/}
                        toolkits=${toolkits/gtk/}
-               else
-                       if ! use gtk2; then
-                               # Just remove the gtk2 bindings (requires gtk2-perl)
-                               rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm
-                               toolkits=${toolkits/gtk2/}
-                       fi
                fi
                toolkits=${toolkits// /}
                if ! test "${toolkits}"; then