Version bump; copied from my subversion repository.

Package-Manager: portage-2.1.5_rc6

3 files changed, 187 insertions, 5 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 85fea4c42416..65a95306c44e 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.146 2008/05/07 05:45:09 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.147 2008/05/14 21:29:51 omp Exp $
+
+*fvwm-2.5.26 (14 May 2008)
+
+  14 May 2008; David Shakaryan <omp@gentoo.org> +fvwm-2.5.26.ebuild:
+  Version bump; copied from my subversion repository.
 
   07 May 2008; David Shakaryan <omp@gentoo.org> fvwm-2.5.25.ebuild:
   Fix patch name. (bug #220217)
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 6d9008f4c334..f2b2ec9cdc0a 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -12,16 +12,18 @@ DIST fvwm-2.5.19.tar.bz2 1990433 RMD160 75aabb54a9a66db21a16a339bbc4359b484b58de
 DIST fvwm-2.5.21-translucent-menus.diff.gz 5144 RMD160 5211216b76bf68e23c5cb339d26da6cb33ff3181 SHA1 ac086d1b4f01d8dc07671edc1cf7e0a03ab32212 SHA256 415a1c1d311cb7d58281a4359ec05a03caebaf8960c88442112dfde33986d408
 DIST fvwm-2.5.21.tar.bz2 2062532 RMD160 4025f6c75c0919bffdaa9acbc7a4d987617d098b SHA1 a66746c38d392da826b0c6f880b486c1064ee734 SHA256 5549a3ad693f9ab523653738e493e95418626a6d2fd52465ce200ae4116b8800
 DIST fvwm-2.5.25.tar.bz2 2516717 RMD160 bf77786a071838304eb4bf8cc14960196c235506 SHA1 8e0f0b1eb888f7fcc27a0dbcc32a5b0f2895df2b SHA256 212dafb5fbace4a72d7a2d2dd6df7445709bad6739162a72879e4a6e942d69fc
+DIST fvwm-2.5.26.tar.bz2 2509177 RMD160 47be927e61ef5411b668baec0e9a00d5691b3784 SHA1 26d9054c0f148a397eeaa9939be9329fb002831f SHA256 84aca15165f600c5c09095c94b3ad1f0bfe16ba25cf2097f76312a0fba89251d
 EBUILD fvwm-2.5.18-r1.ebuild 5342 RMD160 7184f789e5b60fcabe6a266a1bcae1b4d0994def SHA1 db5f4e91ea91fdb50d66fd321e7d23818b0afc8f SHA256 485111128ef048a2e5fd29b99cf2fb53474a71cceb14099bfdddba12947c421b
 EBUILD fvwm-2.5.19.ebuild 5306 RMD160 11aeabebe3c3de162a143010d3a8daa1e32357dc SHA1 72b1a234e60780bd004e9951bc938793a3898f09 SHA256 32b34fb181562a3185efc6bf27acce16b183429ff4861d071ba8ad4c73a0ac55
 EBUILD fvwm-2.5.21.ebuild 5175 RMD160 1ac917e4e7bc2214d6425b21882fc9ac4ba3118e SHA1 2f63ebfab738f4752c1b9619f6917f82d20009bd SHA256 01c67714fedb40519f40f029672da69d487f437cf212116a2c464229dcf92050
 EBUILD fvwm-2.5.25.ebuild 4391 RMD160 248d0abda76a8d460c47d5aad86e3c8dd8a80dca SHA1 6cd5606b365636e36e579f99c9b8ca57a1b4ac83 SHA256 393b59873a34823bfe58201bf8dde35175b4158457a8913a5b10bda81d9a1677
-MISC ChangeLog 23387 RMD160 fe8e8f0248de9d22ecf36aa855b5b2c7aa0f6dc1 SHA1 42190be061d1798001f078a9e6d1639d61871766 SHA256 508829fddc115dd3cffda6f7f5481e972618710cdf5fd8faf0e42599fcc69720
+EBUILD fvwm-2.5.26.ebuild 4835 RMD160 435458a3717bb4c2a46b1876507b64685d7e8158 SHA1 f89e04ec85f378a2d21ab5ce08186008ae6e3578 SHA256 dad1467f95ffd02dc528fc95fc072484a636998fdf585ae0275c2a9c916ae0ec
+MISC ChangeLog 23539 RMD160 eeb8bc034d627e13ab1602f2182f1d5db5325961 SHA1 96bb9bc175e3bfa0813d41225a2d150da91b8e15 SHA256 79095b184f7230f488529d833a094f89535eec224e883b043701c4bcd8873128
 MISC metadata.xml 457 RMD160 93a855023075a13689e1be163e9239b2b007f891 SHA1 b79ff83fc615e47151ba8c6bea3c4ff66431ffb7 SHA256 8fae0d59a5fac96ffb4878e15312de19c1c551511f0369387c59c77d1629fd97
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkghQe8ACgkQvSApE0uP4UvlZQCdE5x7OGAEVAHQgudfp4AoJX0X
-UycAoITjBOJ+qgrvyMrE5Qsc8p9a9J5w
-=Fu0x
+iEYEARECAAYFAkgrWdcACgkQvSApE0uP4UujTwCggMD/tQPzgH/DVOuR+2gZmjhZ
+hCEAn1bGo0SCEQx8Ni1SJjjLo1tSbT9m
+=UlnP
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/fvwm/fvwm-2.5.26.ebuild b/x11-wm/fvwm/fvwm-2.5.26.ebuild
new file mode 100644
index 000000000000..e51675dc9d45
--- /dev/null
+++ b/x11-wm/fvwm/fvwm-2.5.26.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.26.ebuild,v 1.1 2008/05/14 21:29:51 omp 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"
+
+LICENSE="GPL-2 FVWM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bidi debug doc gtk gtk2-perl imlib netpbm nls perl png readline rplay stroke svg tk truetype vanilla xinerama"
+
+COMMON_DEPEND="
+	dev-libs/libxml2
+	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 )
+	gtk? (
+		=x11-libs/gtk+-1.2*
+		imlib? ( media-libs/imlib )
+	)
+	png? ( media-libs/libpng )
+	readline? (
+		sys-libs/ncurses
+		sys-libs/readline
+	)
+	stroke? ( dev-libs/libstroke )
+	svg? ( gnome-base/librsvg )
+	truetype? (
+		media-libs/fontconfig
+		virtual/xft
+	)
+	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 )
+	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_unpack() {
+	unpack ${A}
+
+	if ! use vanilla; then
+		cd "${S}"
+
+		# Enables fast translucent menus; patch from fvwm-user mailing list.
+		epatch "${FILESDIR}/fvwm-2.5.23-translucent-menus.diff"
+
+		# A Gentoo-specific compatibility patch.
+		epatch "${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff"
+	fi
+}
+
+src_compile() {
+	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
+
+	if use gtk; then
+		if ! use imlib; then
+			einfo "ATTN: You can safely ignore any imlib related configure errors."
+			myconf="${myconf} --with-imlib-prefix=${T}"
+		fi
+	else
+		myconf="${myconf} --disable-gtk"
+	fi
+
+	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 "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# 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 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"
+
+	echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}"
+
+	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"
+}