From 6c85eeb3be176f6e1481aa779ed4bf818c0d6269 Mon Sep 17 00:00:00 2001 From: Tavis Ormandy Date: Sun, 28 Aug 2005 20:19:12 +0000 Subject: bump (Portage version: 2.0.51.19) --- x11-wm/fvwm/ChangeLog | 5 +- x11-wm/fvwm/Manifest | 2 + x11-wm/fvwm/files/digest-fvwm-2.5.14 | 3 + x11-wm/fvwm/fvwm-2.5.14.ebuild | 254 +++++++++++++++++++++++++++++++++++ 4 files changed, 263 insertions(+), 1 deletion(-) create mode 100644 x11-wm/fvwm/files/digest-fvwm-2.5.14 create mode 100644 x11-wm/fvwm/fvwm-2.5.14.ebuild (limited to 'x11-wm/fvwm') diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog index eb21128aa467..cc741ef2a2de 100644 --- a/x11-wm/fvwm/ChangeLog +++ b/x11-wm/fvwm/ChangeLog @@ -1,6 +1,9 @@ # 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.99 2005/07/19 12:32:42 taviso Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.100 2005/08/28 20:19:12 taviso Exp $ + + 28 Aug 2005; Tavis Ormandy : + bump, use -fno-strict-aliasing as recommended by upstream. 19 Jul 2005; Tavis Ormandy -files/fvwm-2.5.10-FvwmCommand.diff, -files/fvwm-2.5.10-Test-update.diff, diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index 2ba7a3a84323..c7dfeb708908 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -1,5 +1,6 @@ MD5 cfc37d7eb6be1a5a71178973ca1a2e3f fvwm-2.5.13-r1.ebuild 7864 MD5 d4ad99d2edb49ee23de8acb401f8ba0c fvwm-2.5.12.ebuild 8960 +MD5 71b8377a1e96b61d17747d5b517482c7 fvwm-2.5.14.ebuild 7778 MD5 f074838c8c5ef999d25ea4b466b10ea7 ChangeLog 17417 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527 MD5 ba8d61baf42b7f21be2488b3581ff51d fvwm-2.4.18.ebuild 2956 @@ -7,6 +8,7 @@ MD5 d91fb7d2af57653fc93a70e6e1c0a0ea files/fvwm-menu-xlock-xlockmore-compat.diff 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 diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.14 b/x11-wm/fvwm/files/digest-fvwm-2.5.14 new file mode 100644 index 000000000000..15e7e8e135cf --- /dev/null +++ b/x11-wm/fvwm/files/digest-fvwm-2.5.14 @@ -0,0 +1,3 @@ +MD5 536045930f14136181d714cf0b696f35 fvwm-2.5.14.tar.bz2 1977058 +MD5 b71f32fa911b052668328813102173a7 fvwm-2.5.14-translucent-menus.diff.gz 3408 +MD5 6e7d19a9130f5b7135c822965805517a FvwmTabs-v3-4.tar.gz 28659 diff --git a/x11-wm/fvwm/fvwm-2.5.14.ebuild b/x11-wm/fvwm/fvwm-2.5.14.ebuild new file mode 100644 index 000000000000..28355628b98f --- /dev/null +++ b/x11-wm/fvwm/fvwm-2.5.14.ebuild @@ -0,0 +1,254 @@ +# 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 $ + +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 + mirror://gentoo/fvwm-2.5.14-translucent-menus.diff.gz + perl? ( http://users.tpg.com.au/users/scottie7/FvwmTabs-v3-4.tar.gz )" + +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" + +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 ) ) + 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 !x11-wm/metisse" + +SFT=${WORKDIR}/FvwmTabs-v3-4 + +src_unpack() { + unpack ${A}; export EPATCH_OPTS="-F3 -l" + + # this patch enables fast translucent menus in fvwm. 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.14-translucent-menus.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 + + # remove XBell when grab fails. + cd ${S}; epatch ${FILESDIR}/fvwm-noxbell-grab-fail.diff +} + +src_compile() { + local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs" + + + # use readline in FvwmConsole. + if ! use readline; then + myconf="${myconf} --without-readline-library" + else + myconf="${myconf} --with-readline-library --without-termcap-library" + fi + + # 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 + myconf="${myconf} --without-gnome" + fi + + # rplay is a cool, but little used way of playing sounds over a network + 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 + if use bidi; then + myconf="${myconf} --enable-bidi" + else + myconf="${myconf} --disable-bidi" + fi + + # png image support + 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" + fi + + # Xft Anti Aliased text support + if use truetype; then + myconf="${myconf} --enable-xft" + else + myconf="${myconf} --disable-xft" + fi + + # set the local maintainer for fvwm-bug. + export FVWM_BUGADDR="taviso@gentoo.org" + + append-flags -fno-strict-aliasing + + 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 "For information about the changes in this release, please" + einfo "refer to the NEWS file." + echo +} -- cgit v1.2.3-65-gdbad