From 878c6f078774a6ed0fdfd016e7e0c674a79d3beb Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Fri, 11 Nov 2011 17:14:19 +0000 Subject: [PATCH] old Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64 --- x11-wm/fvwm/ChangeLog | 6 +- x11-wm/fvwm/Manifest | 19 +-- x11-wm/fvwm/files/fvwm-2.5.28-libpng14.patch | 42 ----- x11-wm/fvwm/fvwm-2.5.28.ebuild | 165 ------------------- x11-wm/fvwm/fvwm-2.5.31.ebuild | 159 ------------------ 5 files changed, 14 insertions(+), 377 deletions(-) delete mode 100644 x11-wm/fvwm/files/fvwm-2.5.28-libpng14.patch delete mode 100644 x11-wm/fvwm/fvwm-2.5.28.ebuild delete mode 100644 x11-wm/fvwm/fvwm-2.5.31.ebuild diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog index 94715c685668..14fa79692ded 100644 --- a/x11-wm/fvwm/ChangeLog +++ b/x11-wm/fvwm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/fvwm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.182 2011/10/23 21:42:09 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.183 2011/11/11 17:14:18 ssuominen Exp $ + + 11 Nov 2011; Samuli Suominen -fvwm-2.5.28.ebuild, + -files/fvwm-2.5.28-libpng14.patch, -fvwm-2.5.31.ebuild: + old 23 Oct 2011; Markus Meier fvwm-2.6.2.ebuild: x86 stable, bug #385143 diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index 76c7557b1bbe..84bb17f66147 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -3,21 +3,20 @@ Hash: SHA1 AUX README.translucency 3723 RMD160 f09c9cb205731ae97781dd8a59a9b1633851ef36 SHA1 d41ac01641797012ec9673d5233421d89914fb91 SHA256 099c57f9f323ba44e03b9edcfc17da7da08b0438dd5be3c6830f283030e75fe6 AUX fvwm-2.5.27-translucent-menus.diff 15765 RMD160 5629e1fcd6d41e7c9f5cfa0a62204d33d83d5c6f SHA1 2ff0c394e1e393cab8249efeeddf917d07a7ba78 SHA256 ad59f0aa1b73fb128143bf5a390185289c296e0d31a4e6e6ca5f046f414752cf -AUX fvwm-2.5.28-libpng14.patch 1515 RMD160 2df72393e96515f90bb53c125f06e57fbf11e3f4 SHA1 38f529913774b5097ac3673cc96509f0a5aacb94 SHA256 f4e34c3127e8cbdb570b78a28de5aa7a21b63c3b72282bdd3a97b9ff560e1515 -DIST fvwm-2.5.28.tar.bz2 2521994 RMD160 6df61b9b6477ff35b1b9d4f915c3241ead1a4fa1 SHA1 26b83b88656faa3d21ab55544269954e534abe08 SHA256 37a90e443b7f9388d6e696f7be37104ab9ba27194a1008d45ea489c0d906d9fb -DIST fvwm-2.5.31.tar.bz2 2575660 RMD160 1361aec9b2738f8f00d3a8a2798d6535b41e8c39 SHA1 0a59ac1c17f37dbfb1e042f4df3f86a5eb2d719c SHA256 097abb17e2f13f9c1c42b4be4014a3d901bca8fea2dcd6c554e5ee6c2b598e2a DIST fvwm-2.6.2.tar.bz2 2599652 RMD160 66ae6c9f9ac2d0ba6489f58d03ceceea8219aa57 SHA1 522e1fac1101de7825e792ba36bb956216f40fda SHA256 1df8a856c06518b7af4e6709928c35a4cc97b18bad5232ffa889640e54794148 DIST fvwm-2.6.3.tar.bz2 2605294 RMD160 850f906ceaab88a383f01ec00489bd42a8b1374e SHA1 7a04dae0e4a17f4d908589e704b48246b7c05e39 SHA256 8299b8f8d712f95305e51d8e416e3788e35805adcc0bb2e5bcb6cc33db126152 -EBUILD fvwm-2.5.28.ebuild 4630 RMD160 6cedc9e822d48b6fbeeebf22cd3a07588336539d SHA1 47787546b9333d991800b1a1dfebdeb3d50c2a07 SHA256 804bbae59f12250aba84a8199bdf954c479d3935142b023a35dca44b68ffef0e -EBUILD fvwm-2.5.31.ebuild 4497 RMD160 f591cbf115b02a05b4e11cfda03e278176810eca SHA1 18f227ea463e7ab7d8159d3edbb91e3c3a6ea958 SHA256 fe29e6047f17d0af8313dda7d925e48270d54e46ce38b01e248c69e6494c73de EBUILD fvwm-2.6.2.ebuild 4506 RMD160 c3959851e36065c38b598dae3bc83e58f31b20a9 SHA1 ac3aedb421352676c2095b905f7610f156d210b7 SHA256 a829aa8e023692f5612bfe4310ac1f4ee3c26511727ebc4b6eb9e80c93605ae9 EBUILD fvwm-2.6.3.ebuild 4501 RMD160 4cabd2782d8feeabba37214f4a0c818a45a20deb SHA1 8bfc5f34bad512eaaba0b4d28ab941ef7795a4ef SHA256 fe198df47bf9b544e7da9f5936e7423565cdb1b86f130da631d427b8759b87d3 -MISC ChangeLog 28043 RMD160 d6242bb1fb714ad89874e741a7afa175410fa43e SHA1 9bbd1098c5ad864d326e4fea529fcfc55cda570a SHA256 4e9daa876f04ae13dcd2336b3b5d061039b3dddff2d900a44510c1dc6c5173fa +MISC ChangeLog 28186 RMD160 a6b1d1eac26c5ada1872d364557fb08677d7a6d9 SHA1 a17b2d9ca94b7f203c12a4e9b2d730a52e5a0747 SHA256 ae56b9d990d0b16f0fc7ce3b20451817ce8489f36e3b3ec64b98ea33374a7fed MISC metadata.xml 1030 RMD160 b260d643a074659f85850fa34e70bbd8c75bace1 SHA1 95ca4f850821b546bf56cc053bb800cbfe67c54e SHA256 2bc103425bb6eb407042640f5768da44c559fc1e14cd21b7670a0d7c63f823b0 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6kinsACgkQkKaRLQcq0GIQpQCfR4dmOqehDDJPlSsddHvdp/lW -Z98An0LAHLI8B9ZFtpFrYSbnSspyPvT+ -=ANTz +iQEcBAEBAgAGBQJOvVevAAoJEEdUh39IaPFNaUAH/Ao9FRjRRXkAHHcwenHgq3p5 +KhvbR5cmq/YHnAj3rtyvg9DXNbpD725LBBEA0/eskGZT/7SBnUC7CEdhqBnClh54 +vD0VG2GTZGP7h+iEqsK898Tglnxu5hBrYIRxASYxOWZYIyI9Qnt28NHnRITLb2T4 +/xYzRy/rY2oeffqxfPcnli96c9hn3KX+O1zJoaKmmTqPtETA4aFIbTXtUjSd7CTZ +pkd2WdNxtJUkcZrMAz5qEIxKitwUmk0Eh1erBFuxNrukkoRNpk2OuwSqYBIE6oai +hCvcFl0vzG52/u3xsSJEfojtAJRUBafdxfP312lhA2bf8mZEjZSk5lZbMnLEgEg= +=X2Vs -----END PGP SIGNATURE----- diff --git a/x11-wm/fvwm/files/fvwm-2.5.28-libpng14.patch b/x11-wm/fvwm/files/fvwm-2.5.28-libpng14.patch deleted file mode 100644 index 6fef901faa27..000000000000 --- a/x11-wm/fvwm/files/fvwm-2.5.28-libpng14.patch +++ /dev/null @@ -1,42 +0,0 @@ -http://repos.archlinux.org/wsvn/packages/fvwm-devel/trunk/libpng-1.4.patch - ---- libs/PictureImageLoader.c -+++ libs/PictureImageLoader.c -@@ -417,7 +417,7 @@ - return False; - } - fread(buf, 1, FPNG_BYTES_TO_CHECK, f); -- if (!Fpng_check_sig(buf, FPNG_BYTES_TO_CHECK)) -+ if (Fpng_sig_cmp(buf, 0, FPNG_BYTES_TO_CHECK)) - { - fclose(f); - return False; -@@ -503,7 +503,7 @@ - Fpng_set_gray_to_rgb(Fpng_ptr); - if (Fpng_get_bit_depth(Fpng_ptr, Finfo_ptr) < 8) - { -- Fpng_set_gray_1_2_4_to_8(Fpng_ptr); -+ Fpng_set_expand_gray_1_2_4_to_8(Fpng_ptr); - } - } - for (i = 0; i < h; i++) ---- libs/Fpng.h -+++ libs/Fpng.h -@@ -429,7 +429,7 @@ - #define FPNG_FILLER_AFTER PNG_FILLER_AFTER - #define FPNG_INFO_tRNS PNG_INFO_tRNS - --#define Fpng_check_sig(a,b) png_check_sig(a,b) -+#define Fpng_sig_cmp(a,b,c) png_sig_cmp(a,b,c) - #define Fpng_create_read_struct(a,b,c,d) png_create_read_struct(a,b,c,d) - #define Fpng_create_info_struct(a) png_create_info_struct(a) - #define Fpng_destroy_read_struct(a,b,c) png_destroy_read_struct(a,b,c) -@@ -444,7 +444,7 @@ - #define Fpng_set_packing(a) png_set_packing(a) - #define Fpng_set_gray_to_rgb(a) png_set_gray_to_rgb(a) - #define Fpng_get_bit_depth(a,b) png_get_bit_depth(a,b) --#define Fpng_set_gray_1_2_4_to_8(a) png_set_gray_1_2_4_to_8(a) -+#define Fpng_set_expand_gray_1_2_4_to_8(a) png_set_expand_gray_1_2_4_to_8(a) - #define Fpng_get_valid(a,b,c) png_get_valid(a,b,c) - #define Fpng_read_end(a,b) png_read_end(a,b) - #define Fpng_set_interlace_handling(a) png_set_interlace_handling(a) diff --git a/x11-wm/fvwm/fvwm-2.5.28.ebuild b/x11-wm/fvwm/fvwm-2.5.28.ebuild deleted file mode 100644 index f9ee59a48cbe..000000000000 --- a/x11-wm/fvwm/fvwm-2.5.28.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.28.ebuild,v 1.8 2010/03/11 00:03:11 ssuominen Exp $ - -EAPI=2 - -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 gtk2-perl netpbm nls perl png readline rplay stroke svg tk truetype vanilla xinerama lock" - -COMMON_DEPEND=" - 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 ) - 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 ) - lock? ( x11-misc/xlockmore ) - 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_prepare() { - epatch "${FILESDIR}"/${P}-libpng14.patch - - if ! use vanilla; then - # Enables fast translucent menus; patch from fvwm-user mailing list. - epatch "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff" - fi -} - -src_configure() { - 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 - - myconf="${myconf} --disable-gtk" - - 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 -} - -src_install() { - emake DESTDIR="${D}" install || die - - # 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 lock; then - find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null - fi - - 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" - - 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} \ - 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.31.ebuild b/x11-wm/fvwm/fvwm-2.5.31.ebuild deleted file mode 100644 index b3a7d6d43749..000000000000 --- a/x11-wm/fvwm/fvwm-2.5.31.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.31.ebuild,v 1.1 2010/09/23 00:03:04 darkside Exp $ - -EAPI=2 - -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 gtk2-perl netpbm nls perl png readline rplay stroke svg tk truetype vanilla xinerama lock" - -COMMON_DEPEND=" - 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 ) - 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 ) - lock? ( x11-misc/xlockmore ) - 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_prepare() { - if ! use vanilla; then - # Enables fast translucent menus; patch from fvwm-user mailing list. - epatch "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff" - fi -} - -src_configure() { - 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 - - myconf="${myconf} --disable-gtk" - - 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) \ - --docdir="/usr/share/doc/${P}" -} - -src_install() { - emake DESTDIR="${D}" docdir="/usr/share/doc/${P}" install || die - - # 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 lock; then - find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null - fi - - 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 - - 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} \ - docs/{DEVELOPERS,error_codes,FAQ,TODO,fvwm.lsm} - - # README file for translucent menus patch. - use vanilla || dodoc "${FILESDIR}"/README.translucency -} -- 2.26.2