minor updates

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 15b41bd0e3a9b97f143bad2f0d6ec112b82880c2..229d62ecc72eb3bade78388f3633f37232d880f6 100644 (file)
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.85 2004/12/07 02:01:22 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.86 2004/12/11 15:55:01 taviso Exp $
+
+  11 Dec 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.12.ebuild:
+  minor updates
 
   07 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> fvwm-2.5.10-r5.ebuild:
   -fPIC is no longer needed on alpha.

diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 2c53f72e2142f82f9e8998823b110a9907325bc8..b36287c4b37bfdd51c520c7182858b1690f1532a 100644 (file)
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,37 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 9bdefd9bd76edf74ad091bd0734559a8 fvwm-2.5.12.ebuild 8958
 MD5 20b47a6cff5d7670cc77157eb4ae38f1 fvwm-2.5.10-r5.ebuild 9574
-MD5 af245027cdcb74b97bfed4413dd79e51 ChangeLog 15709
-MD5 7a45c55db92a3b45a8359a2fee83478a fvwm-2.5.10-r3.ebuild 9099
-MD5 d913b0dbab3f629b3635d9e75a400ae5 fvwm-2.4.18.ebuild 2961
-MD5 7ca411872899e457562f7a4742ff46a6 fvwm-2.5.12.ebuild 9587
-MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
 MD5 cfc9226d20ffee9bc52e58115c25a0c2 fvwm-2.5.10-r6.ebuild 9746
-MD5 c8fa1c05cdae43bd53f68942d684f23a files/digest-fvwm-2.5.12 209
-MD5 0c1b906138bf4e2977e7be1631f949d9 files/digest-fvwm-2.5.10-r3 128
+MD5 6e02555d04db586c7d9a4f3d7575b023 ChangeLog 15795
+MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
+MD5 d913b0dbab3f629b3635d9e75a400ae5 fvwm-2.4.18.ebuild 2961
+MD5 7a45c55db92a3b45a8359a2fee83478a fvwm-2.5.10-r3.ebuild 9099
 MD5 2a5b6dde57161daa48ec5946e78554d7 files/fvwm-2.5.10-fvwmbuttonshover.diff.gz 9994
-MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425
-MD5 856bdf34d1530e03fc3aa2c6b3630ccc files/digest-fvwm-2.5.10-r5 129
-MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788
-MD5 0a39299dd7ca570060f545e659c77604 files/fvwm-2.5.10-FvwmCommand.diff 1013
-MD5 7d84c8175928d331e6d7b253679f5654 files/digest-fvwm-2.4.18 65
-MD5 d8a3811b3a9581c42119cdc86dff4c7d files/fvwm-2.5.10-Test-update.diff 702
 MD5 d91fb7d2af57653fc93a70e6e1c0a0ea files/fvwm-menu-xlock-xlockmore-compat.diff 550
+MD5 d8a3811b3a9581c42119cdc86dff4c7d files/fvwm-2.5.10-Test-update.diff 702
+MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788
 MD5 98b1cd33f30ee47c88a2c3da2b2ddc68 files/fvwm-iconman.diff 2383
-MD5 0fcb3587e80a443304b2e6878b6eab0a files/fvwmtabs-2.8-insecure-tmp-handling.diff 2349
-MD5 856bdf34d1530e03fc3aa2c6b3630ccc files/digest-fvwm-2.5.10-r6 129
-MD5 b20e3c8c23286531b549852ecbed4b74 files/fvwm-2.5.10-post-release.diff 2923
+MD5 7d84c8175928d331e6d7b253679f5654 files/digest-fvwm-2.4.18 65
+MD5 c8fa1c05cdae43bd53f68942d684f23a files/digest-fvwm-2.5.12 209
+MD5 a580b9f394262307f85eae492bbd68d9 files/centerplacement-2.5.10.diff 2431
 MD5 38cb0131791d07053b5d90bf21d1993f files/fvwm-translucent-menus.diff.gz 3582
+MD5 0fcb3587e80a443304b2e6878b6eab0a files/fvwmtabs-2.8-insecure-tmp-handling.diff 2349
 MD5 d15c4e05878e8e2b8a9d5edcf30abdc2 files/fvwm-2.5.9-translucent-menus.diff.gz 58529
 MD5 5bda5a33cdd7fc8517aa413550ad4e1e files/iconfile-2.5.10.diff 745
+MD5 0a39299dd7ca570060f545e659c77604 files/fvwm-2.5.10-FvwmCommand.diff 1013
+MD5 0c1b906138bf4e2977e7be1631f949d9 files/digest-fvwm-2.5.10-r3 128
+MD5 856bdf34d1530e03fc3aa2c6b3630ccc files/digest-fvwm-2.5.10-r5 129
+MD5 856bdf34d1530e03fc3aa2c6b3630ccc files/digest-fvwm-2.5.10-r6 129
+MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425
 MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419
-MD5 a580b9f394262307f85eae492bbd68d9 files/centerplacement-2.5.10.diff 2431
 MD5 efd2297324dd0241c2a879beadfabdb7 files/fvwm-2.5.10-mips-compat.diff 2306
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBtQ76ugEuf3OQ0akRAiYqAJ9v4KM1NrRsmO33vJ0BjDDmd/qvMQCePmGj
-8M5fYj4qnK4RWJRX92dm070=
-=hLww
------END PGP SIGNATURE-----
+MD5 b20e3c8c23286531b549852ecbed4b74 files/fvwm-2.5.10-post-release.diff 2923

diff --git a/x11-wm/fvwm/fvwm-2.5.12.ebuild b/x11-wm/fvwm/fvwm-2.5.12.ebuild
index 52b4e4df374db0328fe85811b20261166cc9ffc5..1b542bfe8688cbfb642dccdb83a10f201813ffee 100644 (file)
--- a/x11-wm/fvwm/fvwm-2.5.12.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.12.ebuild,v 1.5 2004/11/04 05:18:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.12.ebuild,v 1.6 2004/12/11 15:55:01 taviso Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,13 +13,12 @@ SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2
 LICENSE="GPL-2 FVWM"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bidi debug gnome gtk gtk2 imlib ncurses nls nosm noxpm perl png readline rplay stroke tcltk truetype xinerama"
+IUSE="bidi debug gtk gtk2 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*
                                imlib? ( >=media-libs/gdk-pixbuf-0.21.0
-                                               >=media-libs/imlib-1.9.14-r1 )
-                               gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 ) )
+                                               >=media-libs/imlib-1.9.14-r1 ) )
                rplay? ( >=media-sound/rplay-3.3.2 )
                bidi? ( >=dev-libs/fribidi-0.10.4 )
                png? ( >=media-libs/libpng-1.0.12-r2 )
@@ -35,8 +34,7 @@ RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 )
 # XXX: gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency?
 # XXX: gtk perl bindings require dev-perl/gtk-perl, worth a dependency?
 # XXX: netpbm is used by FvwmScript-ScreenDump, worth a dependency?
-DEPEND="${RDEPEND} dev-util/pkgconfig
-       !x11-wm/metisse"
+DEPEND="${RDEPEND} dev-util/pkgconfig !x11-wm/metisse"
 
 SFT=${WORKDIR}/FvwmTabs-v3.3
 
@@ -67,9 +65,6 @@ src_unpack() {
        # fixing #51287, the fvwm-menu-xlock script is not compatible
        # with the xlockmore implementation in portage.
        cd ${S}; epatch ${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff
-
-       # build fails on alpha with certain options without this.
-       use alpha && append-flags -fPIC
 }
 
 src_compile() {
@@ -85,9 +80,7 @@ src_compile() {
        if ! use readline; then
                myconf="${myconf} --without-readline-library"
        else
-               myconf="${myconf} --with-readline-library"
-
-               myconf="${myconf} --without-termcap-library"
+               myconf="${myconf} --with-readline-library --without-termcap-library"
        fi
 
        # since fvwm-2.5.8 GTK support can be diabled with --disable-gtk, previously
@@ -101,11 +94,7 @@ src_compile() {
                        einfo "ATTN: You can safely ignore any imlib related configure errors."
                        myconf="${myconf} --with-imlib-prefix=${T}"
                fi
-               if ! use gnome; then
-                       myconf="${myconf} --without-gnome"
-               else
-                       myconf="${myconf} --with-gnome"
-               fi
+               myconf="${myconf} --without-gnome"
        fi
 
        # rplay is a cool, but little used way of playing sounds over a network
@@ -155,8 +144,6 @@ src_compile() {
        # more verbosity for module developers/hackers/etc.
        if use debug; then
                myconf="${myconf} --enable-debug-msgs --enable-command-log"
-               # XXX: incvs will no longer be needed in 2.5.13, configurable at run time
-               append-flags -DCR_DETECT_MOTION_METHOD_DEBUG
        fi
 
        # Xft Anti Aliased text support
@@ -166,18 +153,6 @@ src_compile() {
                myconf="${myconf} --disable-xft"
        fi
 
-       # disable xsm protocol (session management) support?
-       if use nosm; then
-               myconf="${myconf} --disable-sm"
-       else
-               myconf="${myconf} --enable-sm"
-       fi
-
-       # disable xpm support?
-       if use noxpm; then
-               myconf="${myconf} --without-xpm-library"
-       fi
-
        # set the local maintainer for fvwm-bug.
        export FVWM_BUGADDR="taviso@gentoo.org"
 
@@ -284,7 +259,7 @@ pkg_postinst() {
        fi
        echo
        einfo "If you have been using the 'ShowOnlyIcons never' syntax in"
-       einfo "FvwmIconMan, please update your configuration to use the new "
+       einfo "FvwmIconMan, please update your configuration to use the new"
        einfo "officially supported 'ShowNoIcons' option."
        echo
        einfo "The FvwmButtons 'HoverIcon', 'HoverTitle' and 'HoverColorset'"