summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2009-09-22 03:38:37 +0000
committerJeremy Olexa <darkside@gentoo.org>2009-09-22 03:38:37 +0000
commit005b72d2cac29862f1274cb88eb9839ba090066e (patch)
tree6dbe6c017c3613e1991aaf07b65cc78d185be2cf /x11-wm/fvwm
parentrevision bump for security bug #280393 (diff)
downloadhistorical-005b72d2cac29862f1274cb88eb9839ba090066e.tar.gz
historical-005b72d2cac29862f1274cb88eb9839ba090066e.tar.bz2
historical-005b72d2cac29862f1274cb88eb9839ba090066e.zip
Version bump, bug fix release. bug 285880
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'x11-wm/fvwm')
-rw-r--r--x11-wm/fvwm/ChangeLog8
-rw-r--r--x11-wm/fvwm/Manifest19
-rw-r--r--x11-wm/fvwm/fvwm-2.5.25.ebuild158
-rw-r--r--x11-wm/fvwm/fvwm-2.5.26.ebuild175
-rw-r--r--x11-wm/fvwm/fvwm-2.5.28.ebuild (renamed from x11-wm/fvwm/fvwm-2.5.27.ebuild)14
5 files changed, 16 insertions, 358 deletions
diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index d55a7fc38b6d..2e2eaf143f20 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-wm/fvwm
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.161 2009/09/12 00:00:50 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.162 2009/09/22 03:38:37 darkside Exp $
+
+*fvwm-2.5.28 (22 Sep 2009)
+
+ 22 Sep 2009; Jeremy Olexa <darkside@gentoo.org> -fvwm-2.5.25.ebuild,
+ -fvwm-2.5.26.ebuild, -fvwm-2.5.27.ebuild, +fvwm-2.5.28.ebuild:
+ Version bump, bug fix release. bug 285880
12 Sep 2009; Tiago Cunha <tcunha@gentoo.org> fvwm-2.5.27-r1.ebuild:
stable sparc, bug 266937
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index e192504dfa41..aeb91dd8d589 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX README.translucency 3723 RMD160 f09c9cb205731ae97781dd8a59a9b1633851ef36 SHA1 d41ac01641797012ec9673d5233421d89914fb91 SHA256 099c57f9f323ba44e03b9edcfc17da7da08b0438dd5be3c6830f283030e75fe6
AUX fvwm-2.5.23-translucent-menus.diff 15765 RMD160 5629e1fcd6d41e7c9f5cfa0a62204d33d83d5c6f SHA1 2ff0c394e1e393cab8249efeeddf917d07a7ba78 SHA256 ad59f0aa1b73fb128143bf5a390185289c296e0d31a4e6e6ca5f046f414752cf
AUX fvwm-2.5.27-translucent-menus.diff 15765 RMD160 5629e1fcd6d41e7c9f5cfa0a62204d33d83d5c6f SHA1 2ff0c394e1e393cab8249efeeddf917d07a7ba78 SHA256 ad59f0aa1b73fb128143bf5a390185289c296e0d31a4e6e6ca5f046f414752cf
@@ -8,20 +5,10 @@ AUX fvwm-menu-directory-security.diff 651 RMD160 4c33671109d1d1f0927bbb755b86691
AUX fvwm-menu-xlock-xlockmore-compat.diff 550 RMD160 72af6f306e5869581fcd48c84edfe00adea4a5b9 SHA1 0eccf83c3046e3822737c5facb23f547a062bff8 SHA256 5db8bc279f618096b23fed04b70b626c6ff50c104283d5ece505200db1e5a8af
DIST fvwm-2.5.18-translucent-menus.diff.gz 82595 RMD160 175e2dc93ca4e265a5022655deeede32dd653b38 SHA1 58e7120717e9dc581d9c6b61770aa740ef33bcbe SHA256 ffdaf69a93f626a709541e15ecbbb8842c306543beebd4adc909a6edbda42516
DIST fvwm-2.5.18.tar.bz2 2034340 RMD160 68bd7a5d3e1c5fb3776de0fbda75414d9e7ad54b SHA1 b7ef45dfe3975deab38dd9ae306c5fd280f307c6 SHA256 8489b32ad488d91898d9be0ff4ec4697590feee66f10de88301511efc617e9c5
-DIST fvwm-2.5.25.tar.bz2 2516717 RMD160 bf77786a071838304eb4bf8cc14960196c235506 SHA1 8e0f0b1eb888f7fcc27a0dbcc32a5b0f2895df2b SHA256 212dafb5fbace4a72d7a2d2dd6df7445709bad6739162a72879e4a6e942d69fc
-DIST fvwm-2.5.26.tar.bz2 2509177 RMD160 47be927e61ef5411b668baec0e9a00d5691b3784 SHA1 26d9054c0f148a397eeaa9939be9329fb002831f SHA256 84aca15165f600c5c09095c94b3ad1f0bfe16ba25cf2097f76312a0fba89251d
DIST fvwm-2.5.27.tar.bz2 2524965 RMD160 3b08849931d026619a45583f26528088efc51f6f SHA1 52a3300c5f13468fa61205477a07f0e5d4767a6b SHA256 149fc5a0a170473b6bea79127eb9f2a19c507929500fd6560162d7a12461c855
+DIST fvwm-2.5.28.tar.bz2 2521994 RMD160 6df61b9b6477ff35b1b9d4f915c3241ead1a4fa1 SHA1 26b83b88656faa3d21ab55544269954e534abe08 SHA256 37a90e443b7f9388d6e696f7be37104ab9ba27194a1008d45ea489c0d906d9fb
EBUILD fvwm-2.5.18-r1.ebuild 5363 RMD160 166152c3c5ca70a2e63209796881b8a3d725b153 SHA1 7c049074fddfb4079af6b984454c353407b5f335 SHA256 81b1f71bc53a1366d61ef5e73de313272749a13efcb5120f56c0923606e96c30
-EBUILD fvwm-2.5.25.ebuild 4396 RMD160 356c644a5a32542c0e270834b56557b44c3db5d0 SHA1 5fdc5cc0c6b9109898a0d0ff3c40c11e67449742 SHA256 a418be99ec9d553cffed3a6dabfff1dea7782bcfc4d8a728d54367430795b445
-EBUILD fvwm-2.5.26.ebuild 4840 RMD160 2b01847b9db40f22c69bf9c3a7bec80182ede45a SHA1 15811d2e7cc0e993ebc986203c96f7fb440b43ac SHA256 7e888246e3f4bfb25a9938b8e8af1fd166534ab62c231bb468e6194ea19605af
EBUILD fvwm-2.5.27-r1.ebuild 4942 RMD160 4864e2b6656e81dc17e61efbc0cd2add2b316c4d SHA1 cb926c9564b2d711d68ee94b45ea875c467d3ccc SHA256 bec8f99a98064d25ad43e2563833dfd2b8cfdd8cf6535586e605db952b381677
-EBUILD fvwm-2.5.27.ebuild 4901 RMD160 4ec0419b752c114b0c52fa14dc171dc1cce83598 SHA1 fbec06129582c97ba0cfaf852e1cb5689381e2a7 SHA256 d61f0c56b260839720955625726fa3f3f597be1f6d78f746a1e11b524fb931aa
-MISC ChangeLog 25438 RMD160 a2c362122e74bffe40b227270f14daef4dc38ebf SHA1 4594551e60fd13aad3037ad3204f40b326e49351 SHA256 cc91e6eaa33a4a3c07ccd38ecbc424a5ce1637f681ca19c80ab00e76d8254d11
+EBUILD fvwm-2.5.28.ebuild 4850 RMD160 cc83dac6a97d7c635beca5c8b4dc06efd18e49a5 SHA1 36d06a191fdbe71d1b4abf9d008aecc0dc892b30 SHA256 ba8348e8dbc4bc68426a3a1ed90159d8e9925990f4cfd8cf2f1439e2af379e05
+MISC ChangeLog 25649 RMD160 332d9d5078c1ea6ea77d7f35a8e4541d7f0c3735 SHA1 c39db53a1aebade484c2284d6c0085d34409d85a SHA256 14fa44197204b0378a2a09cd5e123fcf0fa3403266967f47eeffad6880870148
MISC metadata.xml 1030 RMD160 b260d643a074659f85850fa34e70bbd8c75bace1 SHA1 95ca4f850821b546bf56cc053bb800cbfe67c54e SHA256 2bc103425bb6eb407042640f5768da44c559fc1e14cd21b7670a0d7c63f823b0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqq7EUACgkQAgIglOz4paBWhQCgmhGzWWjb+uNi8FsL8lADpAmk
-yjQAn0/zLt+xZg4623PzzQq4FYfUNzH5
-=gGKV
------END PGP SIGNATURE-----
diff --git a/x11-wm/fvwm/fvwm-2.5.25.ebuild b/x11-wm/fvwm/fvwm-2.5.25.ebuild
deleted file mode 100644
index 2e30f7585a9c..000000000000
--- a/x11-wm/fvwm/fvwm-2.5.25.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.25.ebuild,v 1.3 2009/01/09 15:06:36 remi Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-HOMEPAGE="http://www.fvwm.org/"
-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 ~x86-fbsd"
-IUSE="bidi debug doc gtk imlib nls perl png readline rplay stroke svg tk truetype vanilla xinerama"
-
-RDEPEND="dev-lang/perl
- sys-libs/zlib
- x11-libs/libXpm
- x11-libs/libXft
- bidi? ( dev-libs/fribidi )
- gtk? (
- =x11-libs/gtk+-1.2*
- imlib? ( media-libs/imlib )
- )
- perl? ( tk? (
- dev-lang/tk
- dev-perl/perl-tk
- >=dev-perl/X11-Protocol-0.56
- )
- )
- png? ( media-libs/libpng )
- readline? (
- sys-libs/ncurses
- sys-libs/readline
- )
- rplay? ( media-sound/rplay )
- stroke? ( dev-libs/libstroke )
- svg? ( gnome-base/librsvg )
- truetype? (
- media-libs/fontconfig
- x11-libs/libXft
- )
- userland_GNU? ( sys-apps/debianutils )
- xinerama? ( x11-libs/libXinerama )"
-# 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-libs/libxslt
- dev-util/pkgconfig
- x11-libs/libXrandr
- x11-proto/xextproto
- x11-proto/xproto
- doc? ( dev-libs/libxslt )
- xinerama? ( x11-proto/xineramaproto )"
-
-src_unpack() {
- unpack ${A}
-
- if ! use vanilla; then
- cd "${S}"
-
- # Enables fast translucent menus; patch from fvwm-user mailing list.
- epatch "${FILESDIR}/fvwm-2.5.23-translucent-menus.diff"
-
- # A Gentoo-specific compatibility patch.
- epatch "${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff"
- fi
-}
-
-src_compile() {
- local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs --without-gnome"
-
- # Non-upstream email where bugs should be sent; used in fvwm-bug.
- export FVWM_BUGADDR="desktop-wm@gentoo.org"
-
- # Recommended by upstream.
- append-flags -fno-strict-aliasing
-
- # Signed chars are required.
- use ppc && append-flags -fsigned-char
-
- if use gtk; then
- if ! use imlib; then
- einfo "ATTN: You can safely ignore any imlib related configure errors."
- myconf="${myconf} --with-imlib-prefix=${T}"
- fi
- else
- myconf="${myconf} --disable-gtk"
- fi
-
- use readline && myconf="${myconf} --without-termcap-library"
-
- econf ${myconf} \
- $(use_enable bidi) \
- $(use_enable debug debug-msgs) \
- $(use_enable debug command-log) \
- $(use_enable doc htmldoc) \
- $(use_enable nls) \
- $(use_enable nls iconv) \
- $(use_enable perl perllib) \
- $(use_with png png-library) \
- $(use_with readline readline-library) \
- $(use_with rplay rplay-library) \
- $(use_with stroke stroke-library) \
- $(use_enable svg rsvg) \
- $(use_enable truetype xft) \
- $(use_enable xinerama) \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- if use perl; then
- local toolkits="gtk tcltk"
-
- if ! use tk; then
- rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm"
- toolkits=${toolkits/tcltk/}
- fi
-
- if ! use gtk; then
- rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/"Gtk{,2}.pm
- toolkits=${toolkits/gtk/}
- fi
-
- if ! test "${toolkits// /}"; then
- rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm"
- find "${D}/usr/share/fvwm/perllib" -depth -type d -exec rmdir {} \; 2>/dev/null
- fi
- else
- rm -rf "${D}/usr/bin/fvwm-perllib" \
- "${D}/usr/share/man/man1/fvwm-perllib.1"
- fi
-
- # Utility for testing FVWM behaviour by creating a simple window with
- # configurable hints.
- if use debug; then
- dobin "${S}/tests/hints/hints_test"
- newdoc "${S}/tests/hints/README" README.hints
- fi
-
- # Remove fvwm-convert-2.6 as it does not contain any code.
- rm -f "${D}/usr/bin/fvwm-convert-2.6" \
- "${D}/usr/share/man/man1/fvwm-convert-2.6.1"
-
- echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}"
-
- dodoc AUTHORS ChangeLog NEWS README \
- docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \
- docs/{DEVELOPERS,error_codes,FAQ,TODO,fvwm.lsm}
-
- # README file for translucent menus patch.
- use vanilla || dodoc "${FILESDIR}/README.translucency"
-}
diff --git a/x11-wm/fvwm/fvwm-2.5.26.ebuild b/x11-wm/fvwm/fvwm-2.5.26.ebuild
deleted file mode 100644
index ff55ec6373ab..000000000000
--- a/x11-wm/fvwm/fvwm-2.5.26.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.26.ebuild,v 1.2 2009/01/09 15:06:36 remi Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-HOMEPAGE="http://www.fvwm.org/"
-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 ~x86-fbsd"
-IUSE="bidi debug doc gtk gtk2-perl imlib netpbm nls perl png readline rplay stroke svg tk truetype vanilla xinerama"
-
-COMMON_DEPEND="
- dev-libs/libxml2
- sys-libs/zlib
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- x11-libs/libXcursor
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXpm
- x11-libs/libXrandr
- x11-libs/libXrender
- bidi? ( dev-libs/fribidi )
- gtk? (
- =x11-libs/gtk+-1.2*
- imlib? ( media-libs/imlib )
- )
- png? ( media-libs/libpng )
- readline? (
- sys-libs/ncurses
- sys-libs/readline
- )
- stroke? ( dev-libs/libstroke )
- svg? ( gnome-base/librsvg )
- truetype? (
- media-libs/fontconfig
- x11-libs/libXft
- )
- xinerama? (
- x11-proto/xineramaproto
- x11-libs/libXinerama
- )"
-
-RDEPEND="${COMMON_DEPEND}
- dev-lang/perl
- gtk2-perl? ( dev-perl/gtk2-perl )
- perl? ( tk? (
- dev-lang/tk
- dev-perl/perl-tk
- >=dev-perl/X11-Protocol-0.56
- )
- )
- rplay? ( media-sound/rplay )
- userland_GNU? ( sys-apps/debianutils )
- !x86-fbsd? ( netpbm? ( media-libs/netpbm ) )"
-
-DEPEND="${COMMON_DEPEND}
- dev-util/pkgconfig
- doc? ( dev-libs/libxslt )
- x11-proto/xextproto
- x11-proto/xproto"
-
-src_unpack() {
- unpack ${A}
-
- if ! use vanilla; then
- cd "${S}"
-
- # Enables fast translucent menus; patch from fvwm-user mailing list.
- epatch "${FILESDIR}/fvwm-2.5.23-translucent-menus.diff"
-
- # A Gentoo-specific compatibility patch.
- epatch "${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff"
- fi
-}
-
-src_compile() {
- local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs --without-gnome"
-
- # Non-upstream email where bugs should be sent; used in fvwm-bug.
- export FVWM_BUGADDR="desktop-wm@gentoo.org"
-
- # Recommended by upstream.
- append-flags -fno-strict-aliasing
-
- # Signed chars are required.
- use ppc && append-flags -fsigned-char
-
- if use gtk; then
- if ! use imlib; then
- einfo "ATTN: You can safely ignore any imlib related configure errors."
- myconf="${myconf} --with-imlib-prefix=${T}"
- fi
- else
- myconf="${myconf} --disable-gtk"
- fi
-
- use readline && myconf="${myconf} --without-termcap-library"
-
- econf ${myconf} \
- $(use_enable bidi) \
- $(use_enable debug debug-msgs) \
- $(use_enable debug command-log) \
- $(use_enable doc htmldoc) \
- $(use_enable nls) \
- $(use_enable nls iconv) \
- $(use_enable perl perllib) \
- $(use_with png png-library) \
- $(use_with readline readline-library) \
- $(use_with rplay rplay-library) \
- $(use_with stroke stroke-library) \
- $(use_enable svg rsvg) \
- $(use_enable truetype xft) \
- $(use_enable xinerama) \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- # These are always removed, because gentoo doesn't have anymore
- # a dev-perl/gtk-perl package, so, these modules are pointless.
- rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm"
- find "${D}" -name '*FvwmGtkDebug*' -exec rm -f '{}' \; 2>/dev/null
-
- if use perl; then
- if ! use tk; then
- rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm"
- if ! use gtk2-perl; then # no tk and no gtk2 bindings
- rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm"
- find "${D}/usr/share/fvwm/perllib" -depth -type d -exec rmdir '{}' \; 2>/dev/null
- fi
- fi
-
- # Now, the Gtk2.pm file, it will require dev-perl/gtk2-perl
- # so it implies gtk2 as well. That's why we need another use flag.
- if ! use gtk2-perl; then
- rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm"
- fi
- else
- # Completely wipe it if ! use perl
- rm -rf "${D}/usr/bin/fvwm-perllib" \
- "${D}/usr/share/man/man1/fvwm-perllib.1"
- fi
-
- # Utility for testing FVWM behaviour by creating a simple window with
- # configurable hints.
- if use debug; then
- dobin "${S}/tests/hints/hints_test"
- newdoc "${S}/tests/hints/README" README.hints
- fi
-
- # Remove fvwm-convert-2.6 as it does not contain any code.
- rm -f "${D}/usr/bin/fvwm-convert-2.6" \
- "${D}/usr/share/man/man1/fvwm-convert-2.6.1"
-
- echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}"
-
- dodoc AUTHORS ChangeLog NEWS README \
- docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \
- docs/{DEVELOPERS,error_codes,FAQ,TODO,fvwm.lsm}
-
- # README file for translucent menus patch.
- use vanilla || dodoc "${FILESDIR}/README.translucency"
-}
diff --git a/x11-wm/fvwm/fvwm-2.5.27.ebuild b/x11-wm/fvwm/fvwm-2.5.28.ebuild
index bcc89054c160..206425fd063c 100644
--- a/x11-wm/fvwm/fvwm-2.5.27.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.28.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.27.ebuild,v 1.9 2009/09/05 22:13:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.28.ebuild,v 1.1 2009/09/22 03:38:37 darkside Exp $
EAPI=2
@@ -12,7 +12,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 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="bidi debug doc gtk gtk2-perl imlib netpbm nls perl png readline rplay stroke svg tk truetype vanilla xinerama lock"
COMMON_DEPEND="
@@ -73,10 +73,7 @@ DEPEND="${COMMON_DEPEND}
src_prepare() {
if ! use vanilla; then
# Enables fast translucent menus; patch from fvwm-user mailing list.
- epatch "${FILESDIR}/${P}-translucent-menus.diff"
-
- # A Gentoo-specific compatibility patch.
- epatch "${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff"
+ epatch "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff"
fi
}
@@ -164,8 +161,9 @@ src_install() {
rm -f "${D}/usr/bin/fvwm-convert-2.6" \
"${D}/usr/share/man/man1/fvwm-convert-2.6.1"
- echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}"
- fperms a+x /etc/X11/Sessions/${PN}
+ dodir /etc/X11/Sessions
+ echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}" || die
+ fperms a+x /etc/X11/Sessions/${PN} || die
dodoc AUTHORS ChangeLog NEWS README \
docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \