new releases

6 files changed, 26 insertions, 67 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 085ac0ce7e96..c0b1401a9295 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.79 2004/09/08 10:00:24 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.80 2004/09/30 17:27:49 taviso Exp $
+
+*fvwm-2.5.11 (30 Sep 2004)
+
+  30 Sep 2004; Tavis Ormandy <taviso@gentoo.org> +fvwm-2.5.11.ebuild:
+  new version of fvwm, and FvwmTabs.
 
 *fvwm-2.5.10-r7 (08 Sep 2004)
 
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 4990f5de7522..67700e85f09d 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,7 +1,7 @@
 MD5 b91e90b446bc591842f20d2d5842346c fvwm-2.5.10-r5.ebuild 9832
-MD5 82177351c1ec7faf62f69fde530a98fc fvwm-2.5.10-r7.ebuild 9995
+MD5 efe989dfda1238736051c8555fb13014 fvwm-2.5.11.ebuild 9162
 MD5 b23a899441a230e45a4fff6a37449370 fvwm-2.5.10-r6.ebuild 9911
-MD5 541b92cb616a3ff48c44f583f6909b58 ChangeLog 14756
+MD5 a936c85f03bd19f26e11f19d24eb7a66 ChangeLog 14892
 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
 MD5 2ec81c8638226c9a1cc11cf41ff5952a fvwm-2.4.18.ebuild 3132
 MD5 167d7709634ac3bd87c3848b41bd307b fvwm-2.5.10-r3.ebuild 9266
@@ -12,6 +12,7 @@ MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788
 MD5 e5701841190ad529d5577c8da69d5006 files/fvwmtabs-insecure-tmp-handling.diff 2350
 MD5 98b1cd33f30ee47c88a2c3da2b2ddc68 files/fvwm-iconman.diff 2383
 MD5 7d84c8175928d331e6d7b253679f5654 files/digest-fvwm-2.4.18 65
+MD5 f054136b408dbdd7a003beccedb209c9 files/digest-fvwm-2.5.11 209
 MD5 a580b9f394262307f85eae492bbd68d9 files/centerplacement-2.5.10.diff 2431
 MD5 38cb0131791d07053b5d90bf21d1993f files/fvwm-translucent-menus.diff.gz 3582
 MD5 0fcb3587e80a443304b2e6878b6eab0a files/fvwmtabs-2.8-insecure-tmp-handling.diff 2349
@@ -21,9 +22,7 @@ MD5 0a39299dd7ca570060f545e659c77604 files/fvwm-2.5.10-FvwmCommand.diff 1013
 MD5 0c1b906138bf4e2977e7be1631f949d9 files/digest-fvwm-2.5.10-r3 128
 MD5 856bdf34d1530e03fc3aa2c6b3630ccc files/digest-fvwm-2.5.10-r5 129
 MD5 856bdf34d1530e03fc3aa2c6b3630ccc files/digest-fvwm-2.5.10-r6 129
-MD5 856bdf34d1530e03fc3aa2c6b3630ccc files/digest-fvwm-2.5.10-r7 129
 MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425
 MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419
 MD5 efd2297324dd0241c2a879beadfabdb7 files/fvwm-2.5.10-mips-compat.diff 2306
-MD5 050831079932bfbec0da48fc41788739 files/fvwm-2.5.10-long-data-elements.diff 424
 MD5 b20e3c8c23286531b549852ecbed4b74 files/fvwm-2.5.10-post-release.diff 2923
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.10-r7 b/x11-wm/fvwm/files/digest-fvwm-2.5.10-r7
deleted file mode 100644
index 8badcdb941fd..000000000000
--- a/x11-wm/fvwm/files/digest-fvwm-2.5.10-r7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b3c86e2af2a4eabe692c9c849ff4b243 fvwm-2.5.10.tar.bz2 1788873
-MD5 17313f940d0110e37f996aae3ead282e FvwmTabs-v3.1.tar.gz 28934
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.11 b/x11-wm/fvwm/files/digest-fvwm-2.5.11
new file mode 100644
index 000000000000..f9bb66330fe8
--- /dev/null
+++ b/x11-wm/fvwm/files/digest-fvwm-2.5.11
@@ -0,0 +1,3 @@
+MD5 c870620e61fdd0241959b0c541402537 fvwm-2.5.11.tar.bz2 1914736
+MD5 93e68afa231548b7e7af4db45082682e fvwm-2.5.11-translucent-menus.diff.gz 3426
+MD5 b4f0563d7a412293e3cac8ac579fb383 FvwmTabs-v3.3.tar.gz 28501
diff --git a/x11-wm/fvwm/files/fvwm-2.5.10-long-data-elements.diff b/x11-wm/fvwm/files/fvwm-2.5.10-long-data-elements.diff
deleted file mode 100644
index f3f66c51f9f6..000000000000
--- a/x11-wm/fvwm/files/fvwm-2.5.10-long-data-elements.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- fvwm/decorations.c.orig 2003-10-21 07:52:33.000000000 +0200
-+++ fvwm/decorations.c 2004-08-06 20:30:05.605756454 +0200
-@@ -94,10 +94,10 @@
- /* Motif  window hints */
- typedef struct
- {
--	int      flags;
--	int      functions;
--	int      decorations;
--	int      inputMode;
-+	long     flags;
-+	long     functions;
-+	long     decorations;
-+	long     inputMode;
- } PropMotifWmHints;
- 
- typedef PropMotifWmHints PropMwmHints;
diff --git a/x11-wm/fvwm/fvwm-2.5.10-r7.ebuild b/x11-wm/fvwm/fvwm-2.5.11.ebuild
index 12f6a7165a0c..08187f4c3406 100644
--- a/x11-wm/fvwm/fvwm-2.5.10-r7.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.10-r7.ebuild,v 1.1 2004/09/08 10:00:24 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.11.ebuild,v 1.1 2004/09/30 17:27:49 taviso Exp $
 
 inherit eutils flag-o-matic
 
@@ -8,7 +8,8 @@ IUSE="bidi debug gnome gtk gtk2 imlib ncurses nls nosm noxpm perl png readline r
 
 DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
 SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2
-		perl? ( http://users.tpg.com.au/users/scottie7/FvwmTabs-v3.1.tar.gz	)"
+		mirror://gentoo/${P}-translucent-menus.diff.gz
+		perl? ( http://users.tpg.com.au/users/scottie7/FvwmTabs-v3.3.tar.gz	)"
 HOMEPAGE="http://www.fvwm.org/"
 
 SLOT="0"
@@ -39,7 +40,7 @@ RDEPEND="readline? ( >=sys-libs/readline-4.1
 # XXX:	netpbm is used by FvwmScript-ScreenDump, worth a dependency?
 DEPEND="${RDEPEND} dev-util/pkgconfig"
 
-SFT=${WORKDIR}/FvwmTabs-v3.1
+SFT=${WORKDIR}/FvwmTabs-v3.3
 
 src_unpack() {
 	unpack ${A}
@@ -47,7 +48,7 @@ src_unpack() {
 	# this patch enables fast translucent menus in fvwm..yummy! this is a
 	# minor tweak of a patch posted to fvwm-user mailing list by Olivier
 	# Chapuis in <20030827135125.GA6370@snoopy.folie>.
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.9-translucent-menus.diff.gz
+	cd ${S}; epatch ${WORKDIR}/${P}-translucent-menus.diff
 
 	# according to a post to fvwm-workers mailing list, Mikhael Goikhman
 	# planned on disabling these debug statements before the release, but
@@ -64,42 +65,12 @@ src_unpack() {
 		eend $?
 	fi
 
-	# this patch adds an 'ShowOnlyIcons Never' option to FvwmIconMan.
-	# XXX: ShowNoIcons ever option added to official FvwmIconMan on 24 Jun 2004
-	# XXX: Remove this patch, and add ewarn about new Syntax.
-	cd ${S}; epatch ${FILESDIR}/fvwm-iconman.diff
-
-	# fix some issues reported since the 2.5.10 release.
-	# XXX: incvs
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.10-post-release.diff
-
-	# build fails on alpha with certain options without this.
-	use alpha && append-flags -fPIC
-
-	# just in case anyone on mips want to test.
-	# XXX: incvs
-	use mips && epatch ${FILESDIR}/fvwm-2.5.10-mips-compat.diff
-
 	# fixing #51287, the fvwm-menu-xlock script is not compatible
 	# with the xlockmore implementation in portage.
-	epatch ${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff
-
-	# XXX: incvs
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.10-FvwmCommand.diff
+	cd ${S}; epatch ${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff
 
-	# XXX: incvs
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.10-Test-update.diff
-
-	# XXX: incvs
-	cd ${S}; epatch ${FILESDIR}/centerplacement-2.5.10.diff
-	cd ${S}; epatch ${FILESDIR}/iconfile-2.5.10.diff
-
-	# XXX: incvs
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.10-fvwmbuttonshover.diff.gz
-
-	# XXX: incvs
-	# fix some 64bit cleanliness issues
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.10-long-data-elements.diff
+	# build fails on alpha with certain options without this.
+	use alpha && append-flags -fPIC
 }
 
 src_compile() {
@@ -220,7 +191,6 @@ src_compile() {
 }
 
 src_install() {
-
 	make DESTDIR=${D} install || die
 
 	if use perl; then
@@ -236,7 +206,7 @@ src_install() {
 			doexe ${SFT}/FvwmTabs
 
 			dodoc ${SFT}/fvwmtabrc ${SFT}/tab.zsh
-			doman ${SFT}FvwmTabs.1
+			doman ${SFT}/FvwmTabs.1
 			dohtml ${SFT}/FvwmTabs.man.html
 
 			newdoc ${SFT}/README README.fvwmtabs
@@ -302,10 +272,6 @@ src_install() {
 
 	dodoc ${FILESDIR}/README.transluceny.gz
 
-	# make sure FvwmGtk man page is installed
-	# XXX: Fixed in cvs
-	use gtk && doman ${S}/modules/FvwmGtk/FvwmGtk.1
-
 	# fix a couple of symlinks.
 	prepallman
 }
@@ -321,4 +287,9 @@ pkg_postinst() {
 			einfo
 		fi
 	fi
+	echo
+	einfo "If you have been using the 'ShowOnlyIcons never' syntax in FvwmIconMan,"
+	einfo "please update your configuration to use the new officially supported"
+	einfo "'ShowNoIcons' option."
+	echo
 }