From 83bc5e0ad1e528a55f93815d7c2a6b8fc1799c5a Mon Sep 17 00:00:00 2001 From: Tavis Ormandy Date: Fri, 20 Jan 2006 20:40:14 +0000 Subject: new version (Portage version: 2.0.51.22-r3) --- x11-wm/fvwm/ChangeLog | 8 +- x11-wm/fvwm/Manifest | 3 +- x11-wm/fvwm/files/digest-fvwm-2.5.15 | 2 - x11-wm/fvwm/files/digest-fvwm-2.5.16 | 2 + x11-wm/fvwm/fvwm-2.5.15.ebuild | 215 ----------------------------------- x11-wm/fvwm/fvwm-2.5.16.ebuild | 210 ++++++++++++++++++++++++++++++++++ 6 files changed, 221 insertions(+), 219 deletions(-) delete mode 100644 x11-wm/fvwm/files/digest-fvwm-2.5.15 create mode 100644 x11-wm/fvwm/files/digest-fvwm-2.5.16 delete mode 100644 x11-wm/fvwm/fvwm-2.5.15.ebuild create mode 100644 x11-wm/fvwm/fvwm-2.5.16.ebuild (limited to 'x11-wm') diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog index 8d323757c265..a46dc03caee2 100644 --- a/x11-wm/fvwm/ChangeLog +++ b/x11-wm/fvwm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-wm/fvwm # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.104 2006/01/16 17:17:53 taviso Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.105 2006/01/20 20:40:14 taviso Exp $ + +*fvwm-2.5.16 (20 Jan 2006) + + 20 Jan 2006; Tavis Ormandy -fvwm-2.5.15.ebuild, + +fvwm-2.5.16.ebuild: + new version 16 Jan 2006; Tavis Ormandy fvwm-2.5.15.ebuild: upstream regenerated tarball, so digests no longer match. diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index 60218b6d9e2b..b789f76103cd 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -1,15 +1,16 @@ MD5 c69c07dca73b4d5993a1739ab07e3f9e fvwm-2.5.13-r1.ebuild 7864 MD5 895d1761ee01bdb83d1c1519b8cb0bbd fvwm-2.5.12.ebuild 8959 +MD5 9d731a65d1b2ae47cb940744b805a0f3 fvwm-2.5.16.ebuild 6177 MD5 64c4054742fdadf488d0c5fc7ebb0912 fvwm-2.5.14-r1.ebuild 7784 MD5 123ceaa7267bb01aae5de9d76aa12c28 ChangeLog 18046 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527 -MD5 66440ec27fbd6933243d5d52abdbf769 fvwm-2.5.15.ebuild 6269 MD5 c5f06c61fd43ad06f06740d17ca863f2 fvwm-2.4.18.ebuild 2955 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 179663713b78bcbd93ef8248880de383 files/digest-fvwm-2.5.15 145 +MD5 bd6d1450e538c4a1f46b33f7b83cd63d files/digest-fvwm-2.5.16 145 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.15 b/x11-wm/fvwm/files/digest-fvwm-2.5.15 deleted file mode 100644 index d3f5062a7a86..000000000000 --- a/x11-wm/fvwm/files/digest-fvwm-2.5.15 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 b56fc10535968ab8c059854c9c07c311 fvwm-2.5.15.tar.bz2 2019253 -MD5 b71f32fa911b052668328813102173a7 fvwm-2.5.14-translucent-menus.diff.gz 3408 diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.16 b/x11-wm/fvwm/files/digest-fvwm-2.5.16 new file mode 100644 index 000000000000..933ba2225e67 --- /dev/null +++ b/x11-wm/fvwm/files/digest-fvwm-2.5.16 @@ -0,0 +1,2 @@ +MD5 78eb609bd913868f659034173292b9bd fvwm-2.5.16.tar.bz2 2018815 +MD5 4110ed5d89208f0ec57b60523bed37e0 fvwm-2.5.16-translucent-menus.diff.gz 5022 diff --git a/x11-wm/fvwm/fvwm-2.5.15.ebuild b/x11-wm/fvwm/fvwm-2.5.15.ebuild deleted file mode 100644 index dcad2632125c..000000000000 --- a/x11-wm/fvwm/fvwm-2.5.15.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.15.ebuild,v 1.2 2006/01/16 17:17:54 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" - -LICENSE="GPL-2 FVWM" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -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* - 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 - || ( ( - x11-libs/libXpm - x11-libs/libXft - xinerama? ( x11-libs/libXinerama ) ) - 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 - || ( ( - x11-libs/libXrandr - x11-proto/xextproto - x11-proto/xproto - xinerama? ( x11-proto/xineramaproto ) ) - virtual/x11 )" - -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 - - # 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 - - 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 - - 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 - - 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="gtk tcltk" - - if ! use tcltk; then - # 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/gtk/} - 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 ${FILESDIR}/README.transluceny.gz - - # fix a couple of symlinks. - prepallman -} - -pkg_postinst() { - echo - einfo "For information about the changes in this release, please" - einfo "refer to the NEWS file." - echo -} diff --git a/x11-wm/fvwm/fvwm-2.5.16.ebuild b/x11-wm/fvwm/fvwm-2.5.16.ebuild new file mode 100644 index 000000000000..84e16914df7f --- /dev/null +++ b/x11-wm/fvwm/fvwm-2.5.16.ebuild @@ -0,0 +1,210 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.16.ebuild,v 1.1 2006/01/20 20:40:14 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.16-translucent-menus.diff.gz" + +LICENSE="GPL-2 FVWM" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +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* + 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 + || ( ( + x11-libs/libXpm + x11-libs/libXft + xinerama? ( x11-libs/libXinerama ) ) + 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 + || ( ( + x11-libs/libXrandr + x11-proto/xextproto + x11-proto/xproto + xinerama? ( x11-proto/xineramaproto ) ) + virtual/x11 )" + +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.16-translucent-menus.diff + + # 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 +} + +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 + + 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 + + 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 + + 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" + + # reccommended by upstream + append-flags -fno-strict-aliasing + + econf ${myconf} || die + emake || die +} + +src_install() { + make DESTDIR=${D} install || die + + if use perl; then + + local toolkits="gtk tcltk" + + if ! use tcltk; then + # 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/gtk/} + 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 ${FILESDIR}/README.transluceny.gz + + # fix a couple of symlinks. + prepallman +} + +pkg_postinst() { + einfo + einfo "For information about the changes in this release, please" + einfo "refer to the NEWS file." + einfo +} -- cgit v1.2.3-65-gdbad