Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/x11-wm/fvwm
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/fvwm')
-rw-r--r--x11-wm/fvwm/ChangeLog6
-rw-r--r--x11-wm/fvwm/files/fvwm-2.6.5-ar.patch35
-rw-r--r--x11-wm/fvwm/fvwm-2.6.2.ebuild159
-rw-r--r--x11-wm/fvwm/fvwm-2.6.3.ebuild159
-rw-r--r--x11-wm/fvwm/fvwm-2.6.5.ebuild20
5 files changed, 52 insertions, 327 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/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() {