Version bump, bug 378251 - tested by Jesús Guerrero

Package-Manager: portage-2.1.10.7/cvs/Linux i686

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 70ed7497c21cad10c238a96ea8f2795b1b2f0139..09e18a2f510a38bdaef313ee2497a5f5484502bd 100644 (file)
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.177 2011/05/27 11:36:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.178 2011/08/08 15:43:03 darkside Exp $
+
+*fvwm-2.6.2 (08 Aug 2011)
+
+  08 Aug 2011; Jeremy Olexa <darkside@gentoo.org> -fvwm-2.5.30.ebuild,
+  -fvwm-2.6.1.ebuild, +fvwm-2.6.2.ebuild:
+  Version bump, bug 378251 - tested by Jesús Guerrero
 
   27 May 2011; Michael Weber <xmw@gentoo.org> fvwm-2.6.1.ebuild:
   added ~arm keyword (bug 368715)

diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 78fa313c0a42759092e8a1238a572790843e7947..b729c7fe85ad64f8526fd29dacaf0638f4e67227 100644 (file)
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,23 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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.30.tar.bz2 2568104 RMD160 4959a3a5675fd48e622e24520a5d5158dc5ff9b0 SHA1 fcc082c8e13b262bb4f86f24ed8142a77c10b4f3 SHA256 a8651d23d8eaf4ea40ba84698e5fc01fa2f66bec56b4db764fa1945daa3cd8c3
 DIST fvwm-2.5.31.tar.bz2 2575660 RMD160 1361aec9b2738f8f00d3a8a2798d6535b41e8c39 SHA1 0a59ac1c17f37dbfb1e042f4df3f86a5eb2d719c SHA256 097abb17e2f13f9c1c42b4be4014a3d901bca8fea2dcd6c554e5ee6c2b598e2a
-DIST fvwm-2.6.1.tar.bz2 2574504 RMD160 69b453b11350be5b759ed735d93de9047fb6e609 SHA1 cf7165d40180b45409e604736066cf9fcc792e36 SHA256 0c721dac4d930805f4ec8a0bc5b8febcf286115af60b5754aeadbed409babbc8
+DIST fvwm-2.6.2.tar.bz2 2599652 RMD160 66ae6c9f9ac2d0ba6489f58d03ceceea8219aa57 SHA1 522e1fac1101de7825e792ba36bb956216f40fda SHA256 1df8a856c06518b7af4e6709928c35a4cc97b18bad5232ffa889640e54794148
 EBUILD fvwm-2.5.28.ebuild 4630 RMD160 6cedc9e822d48b6fbeeebf22cd3a07588336539d SHA1 47787546b9333d991800b1a1dfebdeb3d50c2a07 SHA256 804bbae59f12250aba84a8199bdf954c479d3935142b023a35dca44b68ffef0e
-EBUILD fvwm-2.5.30.ebuild 4497 RMD160 dff6d446f9d5070aeba13812c2256d8536c0d83e SHA1 484641abd54efb537606bc5af734ea01f7fee840 SHA256 aeaeab4b3e4f6c126ae0b3427c9918c0c61a1721fa9176f549a1079f06f854cc
 EBUILD fvwm-2.5.31.ebuild 4497 RMD160 f591cbf115b02a05b4e11cfda03e278176810eca SHA1 18f227ea463e7ab7d8159d3edbb91e3c3a6ea958 SHA256 fe29e6047f17d0af8313dda7d925e48270d54e46ce38b01e248c69e6494c73de
-EBUILD fvwm-2.6.1.ebuild 4496 RMD160 c2ae47bc4ef4d70b9af6436b6d82c4e6b66de478 SHA1 ec4ee96bba1f8e470fdb481c268fd1ee8ec79a34 SHA256 0ed935b51d7ea91a3ace3802968764c7c4eb9eeed6aca6eb494d73ee6ca63e79
-MISC ChangeLog 27387 RMD160 3714f486a22e64f2f4ac9ae13c1b9a880c56ae4e SHA1 62dbdebf44748979650312209f55d050cf2a22d6 SHA256 48d1dc4fa29d00ed5dbfb015de78948b16e0b76831cf58d49244b9b3a91fd558
+EBUILD fvwm-2.6.2.ebuild 4501 RMD160 cd01da5f925db4e69fbd87fba48fd4e521ac4c18 SHA1 09aa0aa0b9432840656eb48e054d5cdf04c470d6 SHA256 f873e80398db1aa262194f98b1848e0d5d2cd122b105871b7298a5accd42bdc7
+MISC ChangeLog 27588 RMD160 320b69ba76df07f98923222128fee46c410df450 SHA1 11af9c3517a533a0aabea5abed19425ebf46aa77 SHA256 de8868a7b95f5ca7434d252ef8eecc8d9d1a4adbbc6c826606cdce097bc7aeaa
 MISC metadata.xml 1030 RMD160 b260d643a074659f85850fa34e70bbd8c75bace1 SHA1 95ca4f850821b546bf56cc053bb800cbfe67c54e SHA256 2bc103425bb6eb407042640f5768da44c559fc1e14cd21b7670a0d7c63f823b0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk3fjNkACgkQknrdDGLu8JCBUQD/b3aNoBEztxsj0/J6WShkXpAX
-Ek+6FHNrEDbtMb2WrgUA/2RiCxO/tkZiZcVHPTntgbRJYNZsvXpoMsRZvJKh5UK5
-=EIKp
------END PGP SIGNATURE-----

diff --git a/x11-wm/fvwm/fvwm-2.5.30.ebuild b/x11-wm/fvwm/fvwm-2.5.30.ebuild
deleted file mode 100644 (file)
index b6280e5..0000000
--- a/x11-wm/fvwm/fvwm-2.5.30.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.30.ebuild,v 1.2 2010/05/14 22:59:01 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
-}

diff --git a/x11-wm/fvwm/fvwm-2.6.1.ebuild b/x11-wm/fvwm/fvwm-2.6.2.ebuild
similarity index 97%
rename from x11-wm/fvwm/fvwm-2.6.1.ebuild
rename to x11-wm/fvwm/fvwm-2.6.2.ebuild
index 9c4be9c5a25ec24f7ac94084135dcf265ba17a84..6f068b397eb224f2f2a375ba4f96336a2cf9c42a 100644 (file)
--- a/x11-wm/fvwm/fvwm-2.6.1.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.6.1.ebuild,v 1.2 2011/05/27 11:36:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.6.2.ebuild,v 1.1 2011/08/08 15:43:03 darkside Exp $
 
 EAPI=2