From 1c72c24d8fb48e89b0d41e0b6edd95140f0db8ca Mon Sep 17 00:00:00 2001 From: Tavis Ormandy Date: Wed, 6 Oct 2004 15:50:11 +0000 Subject: new bugfix release --- x11-wm/fvwm/ChangeLog | 8 +- x11-wm/fvwm/Manifest | 36 ++--- x11-wm/fvwm/files/digest-fvwm-2.5.11 | 3 - x11-wm/fvwm/files/digest-fvwm-2.5.12 | 3 + x11-wm/fvwm/fvwm-2.5.11.ebuild | 306 ----------------------------------- x11-wm/fvwm/fvwm-2.5.12.ebuild | 306 +++++++++++++++++++++++++++++++++++ 6 files changed, 334 insertions(+), 328 deletions(-) delete mode 100644 x11-wm/fvwm/files/digest-fvwm-2.5.11 create mode 100644 x11-wm/fvwm/files/digest-fvwm-2.5.12 delete mode 100644 x11-wm/fvwm/fvwm-2.5.11.ebuild create mode 100644 x11-wm/fvwm/fvwm-2.5.12.ebuild (limited to 'x11-wm/fvwm') diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog index ab5c3c577eef..bdc978339887 100644 --- a/x11-wm/fvwm/ChangeLog +++ b/x11-wm/fvwm/ChangeLog @@ -1,6 +1,12 @@ # 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.81 2004/10/06 03:23:39 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.82 2004/10/06 15:50:11 taviso Exp $ + +*fvwm-2.5.12 (06 Oct 2004) + + 06 Oct 2004; Tavis Ormandy fvwm-2.5.11.ebuild, + +fvwm-2.5.12.ebuild: + new (mainly bugfix) release, replaces 2.5.11. 05 Oct 2004; Jason Wever fvwm-2.5.11.ebuild: Added ~sparc keyword. diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index 986959482a74..0bb67756bbc0 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -1,27 +1,27 @@ +MD5 ad407cbbeb430661304a427b932ee8eb fvwm-2.5.12.ebuild 9655 +MD5 b91e90b446bc591842f20d2d5842346c fvwm-2.5.10-r5.ebuild 9832 +MD5 b23a899441a230e45a4fff6a37449370 fvwm-2.5.10-r6.ebuild 9911 MD5 1105841e5757e1ec689468ab4962cd3e ChangeLog 14982 -MD5 2ec81c8638226c9a1cc11cf41ff5952a fvwm-2.4.18.ebuild 3132 -MD5 cf5489ceee4b1690ea6b8881510e8cf4 fvwm-2.5.11.ebuild 9647 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527 -MD5 b91e90b446bc591842f20d2d5842346c fvwm-2.5.10-r5.ebuild 9832 +MD5 2ec81c8638226c9a1cc11cf41ff5952a fvwm-2.4.18.ebuild 3132 MD5 167d7709634ac3bd87c3848b41bd307b fvwm-2.5.10-r3.ebuild 9266 -MD5 b23a899441a230e45a4fff6a37449370 fvwm-2.5.10-r6.ebuild 9911 -MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788 -MD5 5bda5a33cdd7fc8517aa413550ad4e1e files/iconfile-2.5.10.diff 745 -MD5 7d84c8175928d331e6d7b253679f5654 files/digest-fvwm-2.4.18 65 MD5 2a5b6dde57161daa48ec5946e78554d7 files/fvwm-2.5.10-fvwmbuttonshover.diff.gz 9994 -MD5 f054136b408dbdd7a003beccedb209c9 files/digest-fvwm-2.5.11 209 -MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419 -MD5 d15c4e05878e8e2b8a9d5edcf30abdc2 files/fvwm-2.5.9-translucent-menus.diff.gz 58529 +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 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 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425 -MD5 b20e3c8c23286531b549852ecbed4b74 files/fvwm-2.5.10-post-release.diff 2923 -MD5 856bdf34d1530e03fc3aa2c6b3630ccc files/digest-fvwm-2.5.10-r5 129 -MD5 efd2297324dd0241c2a879beadfabdb7 files/fvwm-2.5.10-mips-compat.diff 2306 -MD5 0c1b906138bf4e2977e7be1631f949d9 files/digest-fvwm-2.5.10-r3 128 -MD5 d91fb7d2af57653fc93a70e6e1c0a0ea files/fvwm-menu-xlock-xlockmore-compat.diff 550 +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 d8a3811b3a9581c42119cdc86dff4c7d files/fvwm-2.5.10-Test-update.diff 702 -MD5 a580b9f394262307f85eae492bbd68d9 files/centerplacement-2.5.10.diff 2431 +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 efd2297324dd0241c2a879beadfabdb7 files/fvwm-2.5.10-mips-compat.diff 2306 +MD5 b20e3c8c23286531b549852ecbed4b74 files/fvwm-2.5.10-post-release.diff 2923 diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.11 b/x11-wm/fvwm/files/digest-fvwm-2.5.11 deleted file mode 100644 index f9bb66330fe8..000000000000 --- a/x11-wm/fvwm/files/digest-fvwm-2.5.11 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c870620e61fdd0241959b0c541402537 fvwm-2.5.11.tar.bz2 1914736 -MD5 93e68afa231548b7e7af4db45082682e fvwm-2.5.11-translucent-menus.diff.gz 3426 -MD5 b4f0563d7a412293e3cac8ac579fb383 FvwmTabs-v3.3.tar.gz 28501 diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.12 b/x11-wm/fvwm/files/digest-fvwm-2.5.12 new file mode 100644 index 000000000000..ee286608dcb8 --- /dev/null +++ b/x11-wm/fvwm/files/digest-fvwm-2.5.12 @@ -0,0 +1,3 @@ +MD5 f323c59c2becb6766648b25b2111501c fvwm-2.5.12.tar.bz2 1917317 +MD5 93e68afa231548b7e7af4db45082682e fvwm-2.5.11-translucent-menus.diff.gz 3426 +MD5 b4f0563d7a412293e3cac8ac579fb383 FvwmTabs-v3.3.tar.gz 28501 diff --git a/x11-wm/fvwm/fvwm-2.5.11.ebuild b/x11-wm/fvwm/fvwm-2.5.11.ebuild deleted file mode 100644 index 48acd69ac35d..000000000000 --- a/x11-wm/fvwm/fvwm-2.5.11.ebuild +++ /dev/null @@ -1,306 +0,0 @@ -# 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.11.ebuild,v 1.8 2004/10/06 03:23:39 weeve Exp $ - -inherit eutils flag-o-matic - -IUSE="bidi debug gnome gtk gtk2 imlib ncurses nls nosm noxpm perl png readline rplay stroke tcltk truetype xinerama" - -DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager" -SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2 - mirror://gentoo/${P}-translucent-menus.diff.gz - perl? ( http://users.tpg.com.au/users/scottie7/FvwmTabs-v3.3.tar.gz )" -HOMEPAGE="http://www.fvwm.org/" - -SLOT="0" -KEYWORDS="~x86 ~ppc64 ~ppc ~amd64 ~sparc" -LICENSE="GPL-2 FVWM" - -RDEPEND="readline? ( >=sys-libs/readline-4.1 - ncurses? ( >=sys-libs/ncurses-5.3-r1 ) - !ncurses? ( >=sys-libs/libtermcap-compat-1.2.3 ) ) - 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 ) ) - rplay? ( >=media-sound/rplay-3.3.2 ) - bidi? ( >=dev-libs/fribidi-0.10.4 ) - png? ( >=media-libs/libpng-1.0.12-r2 ) - stroke? ( >=dev-libs/libstroke-0.4 ) - perl? ( tcltk? ( >=dev-lang/tk-8.3.4 - >=dev-perl/perl-tk-800.024-r2 - >=dev-perl/X11-Protocol-0.52 ) ) - truetype? ( virtual/xft >=media-libs/fontconfig-2.1-r1 ) - >=dev-lang/perl-5.6.1-r10 - >=sys-libs/zlib-1.1.4-r1 - sys-apps/debianutils - virtual/x11" -# 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" - -SFT=${WORKDIR}/FvwmTabs-v3.3 - -src_unpack() { - unpack ${A} - - # this patch enables fast translucent menus in fvwm..yummy! this is a - # minor tweak of a patch posted to fvwm-user mailing list by Olivier - # Chapuis in <20030827135125.GA6370@snoopy.folie>. - cd ${S}; epatch ${WORKDIR}/${P}-translucent-menus.diff - - # according to a post to fvwm-workers mailing list, Mikhael Goikhman - # planned on disabling these debug statements before the release, but - # never got around to it. - cd ${S}; epatch ${FILESDIR}/disable-debug-statements.diff - - if use perl; then - # I'll supply a default icon for FvwmTabs, this removes the need for - # installing an iconset, this one comes from the fvwm_icons package. - cd ${SFT} - ebegin " Setting default icon for FvwmTabs" - sed -i 's#happyMini.xpm#/usr/share/fvwm/mini-happy.xpm#g' \ - FvwmTabs FvwmTabs.1 fvwmtabrc - eend $? - fi - - # 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() { - local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs" - - # ImagePath should include /usr/share/icons/fvwm (x11-themes/fvwm_icons) - # - # Another iconset for fvwm, wm-icons, includes configurations and user - # configuration utilities to make them easy to use with fvwm, no need - # to put them in the default ImagePath. - - # use readline in FvwmConsole. - if ! use readline; then - myconf="${myconf} --without-readline-library" - else - myconf="${myconf} --with-readline-library" - - # choose ncurses or termcap. - if use ncurses; then - myconf="${myconf} --without-termcap-library" - else - myconf="${myconf} --without-ncurses-library" - fi - fi - - # since fvwm-2.5.8 GTK support can be diabled with --disable-gtk, previously - # we had to hide the includes/libs during configure. this is still the case - # for GDK image suport _with_ gtk, unfortunately. - # FvwmGtk can be built as a gnome application, or a Gtk+ application. - if ! use gtk; then - myconf="${myconf} --disable-gtk --without-gnome" - else - if ! use imlib; then - 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 - fi - - # rplay is a cool, but little used way of playing sounds over a network - # Fvwm support is pretty good. - if ! use rplay; then - myconf="${myconf} --without-rplay-library" - fi - - # Install perl bindings. - if use perl; then - myconf="${myconf} --enable-perllib" - else - myconf="${myconf} --disable-perllib" - fi - - # xinerama support for those who have multi-headed machines. - if use xinerama; then - myconf="${myconf} --enable-xinerama" - else - myconf="${myconf} --disable-xinerama" - fi - - # bidirectional writing support, eg hebrew - if use bidi; then - myconf="${myconf} --enable-bidi" - else - myconf="${myconf} --disable-bidi" - fi - - # png image support (very nice in fvwm) - if ! use png; then - myconf="${myconf} --without-png-library" - fi - - # native language support - if use nls; then - myconf="${myconf} --enable-nls --enable-iconv" - else - myconf="${myconf} --disable-nls --disable-iconv" - fi - - # support for mouse gestures using libstroke (very very cool) - if ! use stroke; then - myconf="${myconf} --without-stroke-library" - fi - - # more verbosity for module developers/hackers/etc. - if use debug; then - myconf="${myconf} --enable-debug-msgs --enable-command-log" - append-flags -DCR_DETECT_MOTION_METHOD_DEBUG - fi - - # Xft Anti Aliased text support - if use truetype; then - myconf="${myconf} --enable-xft" - else - 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" - - econf ${myconf} || die - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - - if use perl; then - - local toolkits="gtk2 gtk tcltk" - - if use tcltk; then - # Install the very cool FvwmTabs module - # http://users.tpg.com.au/users/scottie7/FvwmTabs - einfo "Installing FvwmTabs module..." - - exeinto /usr/lib/fvwm/${PV}/ - doexe ${SFT}/FvwmTabs - - dodoc ${SFT}/fvwmtabrc ${SFT}/tab.zsh - doman ${SFT}/FvwmTabs.1 - dohtml ${SFT}/FvwmTabs.man.html - - newdoc ${SFT}/README README.fvwmtabs - - # install default drag and drop icon. - insinto /usr/share/fvwm - newins ${FILESDIR}/mini.happy.xpm mini-happy.xpm - else - # Remove the Tk bindings (requires perl-tk) - rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm - toolkits=${toolkits/tcltk/} - fi - if ! use gtk; then - # 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 - # No perl toolkit bindings wanted, remove the unneeded files - # and empty directories. - 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 - # Remove useless script if perllib isnt required. - rm -rf ${D}/usr/bin/fvwm-perllib ${D}/usr/share/man/man1/fvwm-perllib.1 - fi - - # neat utility for testing fvwm behaviour on applications setting various - # hints, creates a simple black window with configurable hints set. - if use debug; then - dobin ${S}/tests/hints/hints_test - newdoc ${S}/tests/hints/README README.hints - fi - - # fvwm-convert-2.6 is just a stub, contains no code - remove it for now. - # fvwm-convert-2.2 has a man page, but the script is no longer distributed. - rm -f ${D}/usr/bin/fvwm-convert-2.6 ${D}/usr/share/man/man1/fvwm-convert-2.6.1 - rm -f ${D}/usr/share/man/man1/fvwm-convert-2.2.1 - - # ive included `exec` to save a few bytes of memory. - echo "#!/bin/bash" > fvwm2 - echo "exec /usr/bin/fvwm2" >> fvwm2 - - exeinto /etc/X11/Sessions - doexe fvwm2 - - dodoc AUTHORS ChangeLog COPYING README NEWS docs/ANNOUNCE docs/BUGS \ - docs/COMMANDS docs/DEVELOPERS docs/FAQ docs/error_codes docs/TODO \ - docs/fvwm.lsm - - dodoc utils/fvwm_make_directory_menu.sh utils/fvwm_make_browse_menu.sh \ - utils/quantize_pixmaps utils/xselection.c - - dodoc ${FILESDIR}/README.transluceny.gz - - # fix a couple of symlinks. - prepallman -} - -pkg_postinst() { - if use perl; then - if use tcltk; then - einfo "By setting the perl and tcltk USE flags, you have elected to" - einfo "install the FvwmTabs module, a configurable tabbing system" - einfo "for FVWM. You can read more about FvwmTabs here:" - einfo - einfo " http://users.tpg.com.au/users/scottie7/fvwmtabs.html" - einfo - fi - fi - echo - einfo "If you have been using the 'ShowOnlyIcons never' syntax in" - einfo "FvwmIconMan, please update your configuration to use the new " - einfo "officially supported 'ShowNoIcons' option." - echo - einfo "The FvwmButtons 'HoverIcon', 'HoverTitle' and 'HoverColorset'" - einfo "features have been renamed 'Active'. Please update your" - einfo "configuration accordingly." - echo - einfo 'The $[w.miniiconfile] and $[w.iconfile] expansion has changed, if' - einfo "the image exists in your ImagePath, it will now expand to the full" - einfo "path of the image." - echo - einfo "For in depth information about all changes in this release, please" - einfo "refer to the ChangeLog." - echo -} diff --git a/x11-wm/fvwm/fvwm-2.5.12.ebuild b/x11-wm/fvwm/fvwm-2.5.12.ebuild new file mode 100644 index 000000000000..cb8e72774a6b --- /dev/null +++ b/x11-wm/fvwm/fvwm-2.5.12.ebuild @@ -0,0 +1,306 @@ +# 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.1 2004/10/06 15:50:11 taviso Exp $ + +inherit eutils flag-o-matic + +IUSE="bidi debug gnome gtk gtk2 imlib ncurses nls nosm noxpm perl png readline rplay stroke tcltk truetype xinerama" + +DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager" +SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2 + mirror://gentoo/fvwm-2.5.11-translucent-menus.diff.gz + perl? ( http://users.tpg.com.au/users/scottie7/FvwmTabs-v3.3.tar.gz )" +HOMEPAGE="http://www.fvwm.org/" + +SLOT="0" +KEYWORDS="~x86 ~ppc64 ~ppc ~amd64 ~sparc" +LICENSE="GPL-2 FVWM" + +RDEPEND="readline? ( >=sys-libs/readline-4.1 + ncurses? ( >=sys-libs/ncurses-5.3-r1 ) + !ncurses? ( >=sys-libs/libtermcap-compat-1.2.3 ) ) + 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 ) ) + rplay? ( >=media-sound/rplay-3.3.2 ) + bidi? ( >=dev-libs/fribidi-0.10.4 ) + png? ( >=media-libs/libpng-1.0.12-r2 ) + stroke? ( >=dev-libs/libstroke-0.4 ) + perl? ( tcltk? ( >=dev-lang/tk-8.3.4 + >=dev-perl/perl-tk-800.024-r2 + >=dev-perl/X11-Protocol-0.52 ) ) + truetype? ( virtual/xft >=media-libs/fontconfig-2.1-r1 ) + >=dev-lang/perl-5.6.1-r10 + >=sys-libs/zlib-1.1.4-r1 + sys-apps/debianutils + virtual/x11" +# 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" + +SFT=${WORKDIR}/FvwmTabs-v3.3 + +src_unpack() { + unpack ${A} + + # this patch enables fast translucent menus in fvwm..yummy! this is a + # minor tweak of a patch posted to fvwm-user mailing list by Olivier + # Chapuis in <20030827135125.GA6370@snoopy.folie>. + cd ${S}; epatch ${WORKDIR}/fvwm-2.5.11-translucent-menus.diff + + # according to a post to fvwm-workers mailing list, Mikhael Goikhman + # planned on disabling these debug statements before the release, but + # never got around to it. + cd ${S}; epatch ${FILESDIR}/disable-debug-statements.diff + + if use perl; then + # I'll supply a default icon for FvwmTabs, this removes the need for + # installing an iconset, this one comes from the fvwm_icons package. + cd ${SFT} + ebegin " Setting default icon for FvwmTabs" + sed -i 's#happyMini.xpm#/usr/share/fvwm/mini-happy.xpm#g' \ + FvwmTabs FvwmTabs.1 fvwmtabrc + eend $? + fi + + # 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() { + local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs" + + # ImagePath should include /usr/share/icons/fvwm (x11-themes/fvwm_icons) + # + # Another iconset for fvwm, wm-icons, includes configurations and user + # configuration utilities to make them easy to use with fvwm, no need + # to put them in the default ImagePath. + + # use readline in FvwmConsole. + if ! use readline; then + myconf="${myconf} --without-readline-library" + else + myconf="${myconf} --with-readline-library" + + # choose ncurses or termcap. + if use ncurses; then + myconf="${myconf} --without-termcap-library" + else + myconf="${myconf} --without-ncurses-library" + fi + fi + + # since fvwm-2.5.8 GTK support can be diabled with --disable-gtk, previously + # we had to hide the includes/libs during configure. this is still the case + # for GDK image suport _with_ gtk, unfortunately. + # FvwmGtk can be built as a gnome application, or a Gtk+ application. + if ! use gtk; then + myconf="${myconf} --disable-gtk --without-gnome" + else + if ! use imlib; then + 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 + fi + + # rplay is a cool, but little used way of playing sounds over a network + # Fvwm support is pretty good. + if ! use rplay; then + myconf="${myconf} --without-rplay-library" + fi + + # Install perl bindings. + if use perl; then + myconf="${myconf} --enable-perllib" + else + myconf="${myconf} --disable-perllib" + fi + + # xinerama support for those who have multi-headed machines. + if use xinerama; then + myconf="${myconf} --enable-xinerama" + else + myconf="${myconf} --disable-xinerama" + fi + + # bidirectional writing support, eg hebrew + if use bidi; then + myconf="${myconf} --enable-bidi" + else + myconf="${myconf} --disable-bidi" + fi + + # png image support (very nice in fvwm) + if ! use png; then + myconf="${myconf} --without-png-library" + fi + + # native language support + if use nls; then + myconf="${myconf} --enable-nls --enable-iconv" + else + myconf="${myconf} --disable-nls --disable-iconv" + fi + + # support for mouse gestures using libstroke (very very cool) + if ! use stroke; then + myconf="${myconf} --without-stroke-library" + fi + + # more verbosity for module developers/hackers/etc. + if use debug; then + myconf="${myconf} --enable-debug-msgs --enable-command-log" + append-flags -DCR_DETECT_MOTION_METHOD_DEBUG + fi + + # Xft Anti Aliased text support + if use truetype; then + myconf="${myconf} --enable-xft" + else + 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" + + econf ${myconf} || die + emake || die +} + +src_install() { + make DESTDIR=${D} install || die + + if use perl; then + + local toolkits="gtk2 gtk tcltk" + + if use tcltk; then + # Install the very cool FvwmTabs module + # http://users.tpg.com.au/users/scottie7/FvwmTabs + einfo "Installing FvwmTabs module..." + + exeinto /usr/lib/fvwm/${PV}/ + doexe ${SFT}/FvwmTabs + + dodoc ${SFT}/fvwmtabrc ${SFT}/tab.zsh + doman ${SFT}/FvwmTabs.1 + dohtml ${SFT}/FvwmTabs.man.html + + newdoc ${SFT}/README README.fvwmtabs + + # install default drag and drop icon. + insinto /usr/share/fvwm + newins ${FILESDIR}/mini.happy.xpm mini-happy.xpm + else + # Remove the Tk bindings (requires perl-tk) + rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm + toolkits=${toolkits/tcltk/} + fi + if ! use gtk; then + # 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 + # No perl toolkit bindings wanted, remove the unneeded files + # and empty directories. + 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 + # Remove useless script if perllib isnt required. + rm -rf ${D}/usr/bin/fvwm-perllib ${D}/usr/share/man/man1/fvwm-perllib.1 + fi + + # neat utility for testing fvwm behaviour on applications setting various + # hints, creates a simple black window with configurable hints set. + if use debug; then + dobin ${S}/tests/hints/hints_test + newdoc ${S}/tests/hints/README README.hints + fi + + # fvwm-convert-2.6 is just a stub, contains no code - remove it for now. + # fvwm-convert-2.2 has a man page, but the script is no longer distributed. + rm -f ${D}/usr/bin/fvwm-convert-2.6 ${D}/usr/share/man/man1/fvwm-convert-2.6.1 + rm -f ${D}/usr/share/man/man1/fvwm-convert-2.2.1 + + # ive included `exec` to save a few bytes of memory. + echo "#!/bin/bash" > fvwm2 + echo "exec /usr/bin/fvwm2" >> fvwm2 + + exeinto /etc/X11/Sessions + doexe fvwm2 + + dodoc AUTHORS ChangeLog COPYING README NEWS docs/ANNOUNCE docs/BUGS \ + docs/COMMANDS docs/DEVELOPERS docs/FAQ docs/error_codes docs/TODO \ + docs/fvwm.lsm + + dodoc utils/fvwm_make_directory_menu.sh utils/fvwm_make_browse_menu.sh \ + utils/quantize_pixmaps utils/xselection.c + + dodoc ${FILESDIR}/README.transluceny.gz + + # fix a couple of symlinks. + prepallman +} + +pkg_postinst() { + if use perl; then + if use tcltk; then + einfo "By setting the perl and tcltk USE flags, you have elected to" + einfo "install the FvwmTabs module, a configurable tabbing system" + einfo "for FVWM. You can read more about FvwmTabs here:" + einfo + einfo " http://users.tpg.com.au/users/scottie7/fvwmtabs.html" + einfo + fi + fi + echo + einfo "If you have been using the 'ShowOnlyIcons never' syntax in" + einfo "FvwmIconMan, please update your configuration to use the new " + einfo "officially supported 'ShowNoIcons' option." + echo + einfo "The FvwmButtons 'HoverIcon', 'HoverTitle' and 'HoverColorset'" + einfo "features have been renamed 'Active'. Please update your" + einfo "configuration accordingly." + echo + einfo 'The $[w.miniiconfile] and $[w.iconfile] expansion has changed, if' + einfo "the image exists in your ImagePath, it will now expand to the full" + einfo "path of the image." + echo + einfo "For in depth information about all changes in this release, please" + einfo "refer to the ChangeLog." + echo +} -- cgit v1.2.3-65-gdbad