Respect AR (#474528 by Michael Mair-Keimberger (iamnr3)), drop old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 60 insertions, 348 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index e8b75ec8d071..a66940b7f979 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.194 2013/06/25 12:59:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.195 2013/10/12 07:23:28 pacho Exp $
+
+  12 Oct 2013; Pacho Ramos <pacho@gentoo.org> +files/fvwm-2.6.5-ar.patch,
+  -fvwm-2.6.2.ebuild, -fvwm-2.6.3.ebuild, fvwm-2.6.5.ebuild:
+  Respect AR (#474528 by Michael Mair-Keimberger (iamnr3)), drop old
 
   25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> fvwm-2.6.5.ebuild:
   Stable for amd64, wrt bug #471900
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 01c228fb1533..84766706cf3a 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,31 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX README.translucency 3723 SHA256 099c57f9f323ba44e03b9edcfc17da7da08b0438dd5be3c6830f283030e75fe6 SHA512 a64ef5147e52e07d4cec8a2f3ebd1340827d0139031ef7ddaf27fc144fcc58858c3ec40eee854034423f853b2c7bdd813f66236c8a9679977084f4a2176a8ffa WHIRLPOOL a7d04082474adba36ca85703b177ac1b9df12646018a76b31409f7bf94a380bb63c1d79b826546ec754ff644c9677273038c36da14f4c91d48cb74cc773694f4
 AUX fvwm-2.5.27-translucent-menus.diff 15765 SHA256 ad59f0aa1b73fb128143bf5a390185289c296e0d31a4e6e6ca5f046f414752cf SHA512 92f78b624ea2bfddb88f825f40930a0a7e4bb1d284276e62985f189cd5b72ee8a92131f7d2a91efdbf508fc8ef002f5b4168188b12b0e23e28fb1ebec471969d WHIRLPOOL 6a2b6cedf94c070a53401b94a66877514f81ce6924cac9bf66d56baeb5e4ed410d258bea5f129f48582290fe55cc513e766064f284d85eab0c4329a162e358db
+AUX fvwm-2.6.5-ar.patch 1077 SHA256 e0c6d11efdb98680a666cde5fd16353e70e4331e735ac59276ffa433f51fcbe6 SHA512 fc66ee5c79b96860705d72b18aab3f8c8f8ad84fead47c4f8f944474a6bfbe0569ee08aa51e8a4d7982541eecd5c302499f99ebf8568f4b4fb1c9e2369233e45 WHIRLPOOL b64715514ee33d5fce990da7f3716c880c1f801b107b28263a9d01f9d4dbfbe6a1e0df45659b78a05e1914f0bb1fff2d58aa03d9480a306560a8809f0bd1f888
 AUX fvwm-2.6.5-mouse-buttons.patch 519 SHA256 7513ae33c11058f78fce5a922d95f7f5cfbafd542e95c35f32cc0469887aa1e0 SHA512 d28a9724697859ca7beac1cc2813c12413654e1c0749297c34fb0ef8bbf97369ac8039d2a82ec673d885b39e1544259b70cecf292639caa9ff99c1b42d34c196 WHIRLPOOL 819ed1c4eda6cb30a47aef8e0d12f2716b8a003fa6cb4c4f0234ca54fbbd680dd171d18131e4d621129f3515a203b8080bea9ee0a80d25d93cc69753eecebc65
-DIST fvwm-2.6.2.tar.bz2 2599652 SHA256 1df8a856c06518b7af4e6709928c35a4cc97b18bad5232ffa889640e54794148 SHA512 25cce9d4081be91f97b60e5bb15cda856adb9081b19e8d9746e5618ecb2579b80656cca3e3eb0ea07ce2401e4c9386cae4ad62029f4df84968933d4203cf6c7b WHIRLPOOL 8e26f24f5d8701f8d3ee4e2fa613cc242f0328d9b65f463b61411e7d4ab9bec63f476c76b99d38d555d38644ae3cf22f3fbf88d08dd16db7915326d5eb67d7c0
-DIST fvwm-2.6.3.tar.bz2 2605294 SHA256 8299b8f8d712f95305e51d8e416e3788e35805adcc0bb2e5bcb6cc33db126152
 DIST fvwm-2.6.5.tar.bz2 2582655 SHA256 21549995c53906be5533746a1cf61b1ecf8dd8ef6816a0b20615d45ff78b48cf SHA512 a1b8cf5a5124b939441834a2fb44c885c579939e4099cf2c8178ea2c4261258df4e565068593699f9446e363135a2666c9288c1bce551a6cf5c6c79287104698 WHIRLPOOL 65ff02fb9f0c9ac5803a77be5b61621393ebb0a772acd32370c7796340726cbe3bfc125a56852272ec4fe619031bf12cb7fb8bc7ed1852b3addffaa355221e68
-EBUILD fvwm-2.6.2.ebuild 4504 SHA256 698a15ab15d577430721267820cc6f5873f53bf6c5dd05270ca653fd3ee86dad SHA512 997e93ceee5cb749a52d99af5365c786bc5493425133d2d69dfedca781259152aa7f5b9d2fbbb81dc5dbb54b6253eb22dff0f890215f6aaffa4607baa74fa122 WHIRLPOOL 90ac5f5f9e4ad105ef6f284e3ab31b1263ba07b05b46791f60a95c4995d5c41200c6b350aaf108dbf3f25dbf07edf461db04d7ffe8314c365899525a3738bab3
-EBUILD fvwm-2.6.3.ebuild 4496 SHA256 286198af2c0afde55129c73dc6aa42014572f0195c4ca60bd8b6e01adf623121 SHA512 70de9169b71af5dc0c7743ea3206b5bc00a7e54756be41e9c5d3e15701e3dbea82e30ff0eef5bea34e9ed72736fb7c1d4836becaa6dff70a720a7fb451738ac9 WHIRLPOOL cd2a22ce7efcbfc1126f2e6c71d6183100591ab98f57736af6f791c86213d71a9c4090a1f851e3fe5ba4ad7c067db4698ebe50a337ae95c51c32680ea0cfda92
-EBUILD fvwm-2.6.5.ebuild 4871 SHA256 401ebc33909c609e0f08425e409ef59544f97939e81e63915768758716423b8b SHA512 cb9a350118852ae70238cc6b0f4882d797e7af767be651ea9434d83d86bcedcb87d67d1001a71d70ac49df5414c5edb36237db80fe3de933f34d4369ad08ee8d WHIRLPOOL 2b7fc683fd9968ce8cdd1fe959edc40b445eae5191ee832c98ff27b64b43f9c2823994156c1f1a76687ee757ef26b8e02b948f6a73d7edf32521fdaa9563e765
-MISC ChangeLog 29674 SHA256 76f7a7f1688228919baa28327adb979412426a3899c15b906cf46b0064153b6a SHA512 c1375090d147c2d8cf036579fd030f21a32047f8cdd19cf3011b05d86962c39ade1f337ff92bc7b15939e4b4fe334f816f7117d21505db0a0ec7c853ff9da07d WHIRLPOOL 82240febfbe546f0a6cb9bb270f9e9dec5d6095d69bdf98ac691b4e7a19d68bf264d4c344db8c76216b2da78d61fae314ce5c2078a15c250422eac435066a775
+EBUILD fvwm-2.6.5.ebuild 4949 SHA256 b43da4a882dc02b29d988a3de854a6c8268fe93da06c4a4bfc0e8d5d68f5f8d5 SHA512 be8a67f21a2c427fd4d01c8f139acaf10cdbc57971e66a572d6a9bc73a02cd277026692337122149d74cae5e465bf14a4ffcb55b5e8a5045b2521561b328fadd WHIRLPOOL 89d3faa8674a48cacbc46ce6835dac5c76639cc124eec945a8d559acc2cbca6eabd56660b2b1eb81cdae6fe6a0eac5d520e8c7205d2a971b811104203e98d29e
+MISC ChangeLog 29881 SHA256 278952217f730c24f8249e69726bf664d2def36967f0311c4248d8b47b71e13c SHA512 dcabce09b9f0209bec7f9e015019897a4dd1580bfe6fb079d0b81b41b799dfb46eabeccd391477c32a9c4141b8c09303c7e2b124d9150af11e07b3e67a415103 WHIRLPOOL c154ff897fd451d4eade699bdee0b8b4039354f7a7509cd446bcc3aea0c340c1b7e3ff149a486961318aa9d5d3d00b7e918772bebe7cbc5f761a37af3aec0bb9
 MISC metadata.xml 939 SHA256 9996a8401667eaabb1b19e6f10082252709ee1a38b57da9ea0b028c65c034cee SHA512 5236a36092ef1ea748450f14784d0b51b1fab1ffbe475919ba08d3fe1b98ab2e8a1ee6d48f83bc89bdb7879beb3ef143a75d7273ea7f9a734cd7cf85fcb7ec3a WHIRLPOOL 67d1ed74ec999aee2db1bc7c9d7dae9fb189c60e7782a1bf0e4b8bd8c3ad6aeda6fa3200bc5e21d2492bcf427a9d6ecaf895dc0e9aa83cc77304f85251e8d624
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRyZQbAAoJELp701BxlEWfNnUP+gJPPpDFV1EkgYeBIY92Mhll
-3RGqRIjR0zIC1muQfU408fqTbyph8vfOkIsdMKJOH+h2rqAeUQiyH7dtkIkGZNGd
-NEoLoviELu1QSAGOx6uxqKqtq45yxHBYrMSE6A6R8hH3weaJpZFdRCH9e5NBXw9Q
-SJsTYzTRhH1dEBrbk0vXV4TMCp+tRWa0RRdg0wbNGkFG+lrEnTIL1q6ErJtj3ufh
-6jITTGALGKhfb0wx5dQyyVS6YdJoMh1kAcY6d32iMXBnaRmWKD+tcKarSNvUmnEf
-nRI5vUDYlwThQwGX2FmAvhvzjYZsZ0JvvZ0uXY0SBYgi7WkfLu7WzRzqto6zIbtH
-LOa09nQ3UZU3XrVbhB9zkNwKG9AS9crDWReAEgQ7ZOx9O5KmUwbnmGHYjxc7QgBz
-RCXaSvMCe6tQJ1fg+gzGq1MxpTFB5hI1qowI4dndUGQ0eB0twDDTUwdmBmQgjx2w
-5HZ+7kcRa4Uoxq/7MjCj5KpAqIX3JDvVecsf5o3g7LFgRHVe+EMq57YKa60zDwis
-SFloORNxLBMX5MEfBcoEy6NTBSD7f8sSPp6BtmO/TFRljuU6mqJhg/gslskHwks8
-whSrMetoT4fNjLmzsO3F4sa0EbjRjMsMiNnQPQENcj4fO0Fu7eZDjgS5GyjG00nH
-clEJ9Asduayu30LJ5VYD
-=xnUu
+iEYEAREIAAYFAlJY+PEACgkQCaWpQKGI+9QZWwCff8an3HMQ5w0aVAk/jXF/Zq22
+9pQAmgJ3+MxojNIj7cWvQyAvXH1iKN1e
+=pASG
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/fvwm/files/fvwm-2.6.5-ar.patch b/x11-wm/fvwm/files/fvwm-2.6.5-ar.patch
new file mode 100644
index 000000000000..b1d62006967f
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-2.6.5-ar.patch
@@ -0,0 +1,35 @@
+--- configure.ac	2012-04-20 12:58:29.000000000 +0200
++++ configure_new.ac	2013-07-21 18:26:17.513904607 +0200
+@@ -209,6 +209,10 @@
+ # optional libraries.
+ AC_PROG_CC
+ AC_PROG_CPP
++AN_MAKEVAR([AR], [AC_PROG_AR])
++AN_PROGRAM([ar], [AC_PROG_AR])
++AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
++AC_PROG_AR
+ 
+ # added -Wall for gcc, what about for others?
+ if test "x$GCC" = "xyes"; then
+--- libs/Makefile.in	2012-04-20 13:03:55.000000000 +0200
++++ libs/Makefile_new.in	2013-07-21 18:27:17.443992505 +0200
+@@ -48,7 +48,7 @@
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+-AR = ar
++AR = @AR@
+ ARFLAGS = cru
+ libfvwm_a_AR = $(AR) $(ARFLAGS)
+ libfvwm_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@
+--- modules/FvwmScript/Widgets/Makefile.in	2012-04-20 13:03:56.000000000 +0200
++++ modules/FvwmScript/Widgets/Makefile_new.in	2013-07-21 18:27:23.844001892 +0200
+@@ -46,7 +46,7 @@
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+-AR = ar
++AR = @AR@
+ ARFLAGS = cru
+ libWidgets_a_AR = $(AR) $(ARFLAGS)
+ libWidgets_a_LIBADD =
diff --git a/x11-wm/fvwm/fvwm-2.6.2.ebuild b/x11-wm/fvwm/fvwm-2.6.2.ebuild
deleted file mode 100644
index fdaab84179f8..000000000000
--- a/x11-wm/fvwm/fvwm-2.6.2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.6.2.ebuild,v 1.6 2012/05/29 19:09:27 ranger 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 ~arm ~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-0.19.2 )
-	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}
-	virtual/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.3.ebuild b/x11-wm/fvwm/fvwm-2.6.3.ebuild
deleted file mode 100644
index ba90f6ef1e0b..000000000000
--- a/x11-wm/fvwm/fvwm-2.6.3.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.6.3.ebuild,v 1.4 2012/05/04 08:58:55 jdhore 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 ~arm ~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}
-	virtual/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.5.ebuild b/x11-wm/fvwm/fvwm-2.6.5.ebuild
index 3665fd2e3549..b3e651ac9144 100644
--- a/x11-wm/fvwm/fvwm-2.6.5.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.6.5.ebuild,v 1.4 2013/06/25 12:59:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.6.5.ebuild,v 1.5 2013/10/12 07:23:28 pacho Exp $
 
-EAPI=4
-inherit eutils flag-o-matic
+EAPI=5
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
 HOMEPAGE="http://www.fvwm.org/"
@@ -43,8 +43,8 @@ COMMON_DEPEND="
 	xinerama? (
 		x11-proto/xineramaproto
 		x11-libs/libXinerama
-	)"
-
+	)
+"
 RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	gtk2-perl? ( dev-perl/gtk2-perl )
@@ -57,13 +57,14 @@ RDEPEND="${COMMON_DEPEND}
 	rplay? ( media-sound/rplay )
 	lock? ( x11-misc/xlockmore )
 	userland_GNU? ( sys-apps/debianutils )
-	!x86-fbsd? ( netpbm? ( media-libs/netpbm ) )"
-
+	!x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
+"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	doc? ( dev-libs/libxslt )
 	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-proto/xproto
+"
 
 src_prepare() {
 	if ! use vanilla; then
@@ -76,6 +77,9 @@ src_prepare() {
 		# Apply user-provided patches to the source tree, bug #411811
 		epatch_user
 	fi
+
+	epatch "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528
+	eautoreconf
 }
 
 src_configure() {