Add vdesktop USE-flag for Robert Wolf in bug #234066, remove old

(Portage version: 2.1.4.4)

5 files changed, 20 insertions, 304 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index a8a862c03cb5..f890ca33d3f7 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.100 2008/08/26 06:43:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.101 2008/08/26 06:56:22 grobian Exp $
+
+  26 Aug 2008; Fabian Groffen <grobian@gentoo.org> metadata.xml,
+  -windowmaker-0.92.0-r3.ebuild, -windowmaker-0.92.0-r4.ebuild,
+  windowmaker-0.92.0-r7.ebuild:
+  Add vdesktop USE-flag for Robert Wolf in bug #234066, remove old
 
   26 Aug 2008; Jeroen Roovers <jer@gentoo.org> windowmaker-0.92.0-r7.ebuild:
   Stable for HPPA (bug #234066).
diff --git a/x11-wm/windowmaker/metadata.xml b/x11-wm/windowmaker/metadata.xml
index 96b57923e0a7..3ecadd4c49b5 100644
--- a/x11-wm/windowmaker/metadata.xml
+++ b/x11-wm/windowmaker/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnustep</herd>
-  <use>
-    <flag name='modelock'>Enable XKB language status lock support. README says: "If you don't know what it is you probably don't need it."</flag>
-  </use>
+	<herd>gnustep</herd>
+	<use>
+		<flag name='modelock'>Enable XKB language status lock support. README
+			says: "If you don't know what it is you probably don't need
+			it."</flag>
+		<flag name='vdesktop'>Enable dynamic virtual desktop (conflicts with
+			software that works on the edges of the screen)</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r3.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r3.ebuild
deleted file mode 100644
index ac71027cf429..000000000000
--- a/x11-wm/windowmaker/windowmaker-0.92.0-r3.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r3.ebuild,v 1.19 2007/08/02 15:26:15 uberlord Exp $
-
-inherit eutils gnustep-funcs flag-o-matic multilib
-
-S=${WORKDIR}/${P/windowm/WindowM}
-
-DESCRIPTION="The fast and light GNUstep window manager"
-SRC_URI="ftp://ftp.windowmaker.info/pub/source/release/${P/windowm/WindowM}.tar.gz
-	http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz"
-HOMEPAGE="http://www.windowmaker.info/"
-
-IUSE="gif gnustep jpeg nls png tiff modelock xinerama"
-DEPEND="x11-libs/libXv
-	x11-libs/libXft
-	x11-libs/libXt
-	media-libs/fontconfig
-	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.6.1-r2 )
-	gnustep? ( gnustep-base/gnustep-make )"
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86 ~x86-fbsd"
-
-if use gnustep; then
-	egnustep_install_domain "Local"
-fi
-
-src_unpack() {
-	is-flag -fstack-protector && filter-flags -fstack-protector \
-		&& ewarn "CFLAG -fstack-protector has been disabled, as it is known to cause bugs with WindowMaker (bug #78051)" && ebeep 2
-	replace-flags "-Os" "-O2"
-	replace-flags "-O3" "-O2"
-
-	unpack ${A}
-	cd "${S}"
-	epatch ${FILESDIR}/${PV/0.92/0.91}/singleclick-shadeormaxopts-0.9x.patch2
-	epatch ${FILESDIR}/${PV/0.92/0.91}/wlist-0.9x.patch
-	epatch ${FILESDIR}/${PV}/${P}-gcc41.patch
-	epatch ${FILESDIR}/${PV}/${P}-fullscreen.patch
-	epatch ${FILESDIR}/${PV}/${P}-qtdialogsfix.patch
-}
-
-src_compile() {
-	local myconf
-	local gs_user_postfix
-
-	# image format types
-	# xpm is provided by X itself
-	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
-
-	# non required X capabilities
-	myconf="${myconf} $(use_enable modelock) $(use_enable xinerama)"
-
-	# integrate with GNUstep environment, or not
-	if use gnustep ; then
-		# install WPrefs.app into GS Local Domain after setting up the GS env
-		egnustep_env
-#		myconf="${myconf} --with-gnustepdir=$(egnustep_system_root)/Applications"
-	else
-		# no change from wm-0.80* ebuilds, as to not pollute things more
-		myconf="${myconf} --with-gnustepdir=/usr/$(get_libdir)/GNUstep"
-	fi
-
-	if use nls; then
-		[ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-	else
-		myconf="${myconf} --disable-locale"
-	fi
-
-	# default settings with $myconf appended
-	econf \
-		--sysconfdir=/etc/X11 \
-		--with-x \
-		--enable-usermenu \
-		--with-pixmapdir=/usr/share/pixmaps \
-		${myconf} || die
-
-#	# don't know if zh_TW is still non-functional, but leaving it out still
-#	#  for now
-#	cd ${S}/po
-#	cp Makefile Makefile.orig
-#	sed 's:zh_TW.*::' \
-#		Makefile.orig > Makefile
-
-#	cd ${S}/WPrefs.app/po
-#	cp Makefile Makefile.orig
-#	sed 's:zh_TW.*::' \
-#		Makefile.orig > Makefile
-
-	cd ${S}
-	for file in ${S}/WindowMaker/*menu*; do
-		if [ -r $file ]; then
-			if use gnustep ; then
-#				sed -e "s/\/usr\/local\/GNUstep/`cat ${TMP}/sed.gs_prefix`System/g;
-#					s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
-				sed -e "s:/usr/local/GNUstep:`cat ${TMP}/sed.gs_prefix`System:g;" \
-					-e "s:XXX_SED_FSLASH:/:g;" < $file > $file.tmp
-			else
-#				sed -e 's/\/usr\/local\/GNUstep/\/usr\/lib\/GNUstep/g;' < $file > $file.tmp
-				sed -e "s:/usr/local/GNUstep:/usr/$(get_libdir)/GNUstep:g;" < $file > $file.tmp
-			fi
-			mv $file.tmp $file;
-
-#			sed -e 's/\/usr\/local\/share\/WindowMaker/\/usr\/share\/WindowMaker/g;' < $file > $file.tmp;
-			sed -e 's:/usr/local/share/WindowMaker:/usr/share/WindowMaker:g;' < $file > $file.tmp;
-			mv $file.tmp $file;
-		fi;
-	done;
-
-	# amd64 and mmx don't play nice together (yet)
-	use amd64 && sed -i -e '/ASM_X86/ d' "${S}/src/config.h"
-
-	cd ${S}
-	emake -j1 || die "windowmaker: make has failed"
-
-	cd ${S}
-	for file in ${S}/WindowMaker/Defaults/W*; do
-		if [ -r $file ]; then
-			if use gnustep; then
-				sed -e "s/\$HOME\/GNUstep\//\$HOME`cat ${TMP}/sed.gs_user_root_suffix`/g;
-						s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
-				mv $file.tmp $file;
-
-				sed -e "s/~\/GNUstep\//~`cat ${TMP}/sed.gs_user_root_suffix`/g;
-						s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
-				mv $file.tmp $file;
-			fi
-		fi
-	done;
-
-	# WindowMaker Extra Package (themes and icons)
-	cd ../WindowMaker-extra-0.1
-	econf || die "windowmaker-extra: configure has failed"
-	emake || die "windowmaker-extra: make has failed"
-}
-
-src_install() {
-	emake install DESTDIR=${D} || die "windowmaker: install has failed."
-
-	dodoc AUTHORS BUGFORM BUGS ChangeLog COPYING* INSTALL* FAQ* \
-		  MIRRORS README* NEWS TODO
-
-	# WindowMaker Extra
-	cd ../WindowMaker-extra-0.1
-	emake install DESTDIR=${D} || die "windowmaker-extra: install failed"
-
-	newdoc README README.extra
-
-	# create wmaker session shell script
-	echo "#!/bin/bash" > wmaker
-	echo "/usr/bin/wmaker" >> wmaker
-	exeinto /etc/X11/Sessions/
-	doexe wmaker
-
-	insinto /etc/X11/dm/Sessions
-	doins ${FILESDIR}/wmaker.desktop
-	make_desktop_entry /usr/bin/wmaker
-}
-
-pkg_postinst() {
-	if use gnustep ; then
-		einfo "WPrefs.app is installed in you GNUstep Local Domain Applications directory."
-	fi
-}
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r4.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r4.ebuild
deleted file mode 100644
index 065b78385ace..000000000000
--- a/x11-wm/windowmaker/windowmaker-0.92.0-r4.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r4.ebuild,v 1.5 2007/10/03 14:19:26 armin76 Exp $
-
-inherit autotools eutils gnustep-base flag-o-matic
-
-S=${WORKDIR}/${P/windowm/WindowM}
-
-DESCRIPTION="The fast and light GNUstep window manager"
-SRC_URI="ftp://ftp.windowmaker.info/pub/source/release/${P/windowm/WindowM}.tar.gz
-	http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz"
-HOMEPAGE="http://www.windowmaker.info/"
-
-IUSE="gif gnustep jpeg nls png tiff modelock xinerama"
-DEPEND="x11-libs/libXv
-	x11-libs/libXft
-	x11-libs/libXt
-	media-libs/fontconfig
-	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.6.1-r2 )
-	gnustep? ( >=gnustep-base/gnustep-make-2.0 )"
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-src_unpack() {
-	is-flag -fstack-protector && filter-flags -fstack-protector \
-		&& ewarn "CFLAG -fstack-protector has been disabled, as it is known to cause bugs with WindowMaker (bug #78051)" && ebeep 2
-	replace-flags "-Os" "-O2"
-	replace-flags "-O3" "-O2"
-
-	unpack ${A}
-	cd "${S}"
-	epatch ${FILESDIR}/${PV/0.92/0.91}/singleclick-shadeormaxopts-0.9x.patch2
-	epatch ${FILESDIR}/${PV/0.92/0.91}/wlist-0.9x.patch
-	epatch ${FILESDIR}/${PV}/${P}-configure.patch
-	epatch ${FILESDIR}/${PV}/${P}-gcc41.patch
-	epatch ${FILESDIR}/${PV}/${P}-fullscreen.patch
-	epatch ${FILESDIR}/${PV}/${P}-qtdialogsfix.patch
-
-	# Fix some paths
-	if use gnustep; then
-		egnustep_env
-	fi
-	for file in ${S}/WindowMaker/*menu*; do
-		if [ -r $file ]; then
-			if use gnustep ; then
-				sed -i "s:/usr/local/GNUstep/Applications:${GNUSTEP_SYSTEM_APPS}:g" $file
-			else
-				sed -i "s:/usr/local/GNUstep/Applications/WPrefs.app:/usr/bin/:g;" $file
-			fi
-
-			sed -i 's:/usr/local/share/WindowMaker:/usr/share/WindowMaker:g;' $file
-			sed -i 's:/opt/share/WindowMaker:/usr/share/WindowMaker:g;' $file
-		fi;
-	done;
-
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_compile() {
-	local myconf
-
-	# image format types
-	# xpm is provided by X itself
-	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
-
-	# non required X capabilities
-	myconf="${myconf} $(use_enable modelock) $(use_enable xinerama)"
-
-	if use gnustep ; then
-		egnustep_env
-		myconf="${myconf} --with-gnustepdir=${GNUSTEP_SYSTEM_ROOT}"
-	fi
-
-	if use nls; then
-		[ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-	else
-		myconf="${myconf} --disable-locale"
-	fi
-
-	# default settings with $myconf appended
-	econf \
-		--sysconfdir=/etc/X11 \
-		--with-x \
-		--enable-usermenu \
-		--with-pixmapdir=/usr/share/pixmaps \
-		--with-nlsdir=/usr/share/locale \
-		${myconf} || die
-
-	emake || die "windowmaker: make has failed"
-
-	# WindowMaker Extra Package (themes and icons)
-	cd ../WindowMaker-extra-0.1
-	econf || die "windowmaker-extra: configure has failed"
-	emake || die "windowmaker-extra: make has failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "windowmaker: install has failed."
-
-	dodoc AUTHORS BUGFORM BUGS ChangeLog COPYING* INSTALL* FAQ* \
-		  MIRRORS README* NEWS TODO
-
-	# WindowMaker Extra
-	cd ../WindowMaker-extra-0.1
-	emake DESTDIR="${D}" install || die "windowmaker-extra: install failed"
-
-	newdoc README README.extra
-
-	# create wmaker session shell script
-	echo "#!/bin/bash" > wmaker
-	echo "/usr/bin/wmaker" >> wmaker
-	exeinto /etc/X11/Sessions/
-	doexe wmaker
-
-	insinto /etc/X11/dm/Sessions
-	doins ${FILESDIR}/wmaker.desktop
-	make_desktop_entry /usr/bin/wmaker
-}
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r7.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r7.ebuild
index 2cb87ee6faf4..4e53343857fa 100644
--- a/x11-wm/windowmaker/windowmaker-0.92.0-r7.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r7.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r7.ebuild,v 1.7 2008/08/26 06:43:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r7.ebuild,v 1.8 2008/08/26 06:56:22 grobian Exp $
+
+EAPI=1
 
 inherit autotools eutils gnustep-base flag-o-matic
 
@@ -13,7 +15,7 @@ SRC_URI="ftp://ftp.windowmaker.info/pub/source/release/${P/windowm/WindowM}.tar.
 	http://www.gentoo.org/~grobian/distfiles/${P}-patchset-${PATCHVER}.tar.bz2"
 HOMEPAGE="http://www.windowmaker.info/"
 
-IUSE="gif gnustep jpeg nls png tiff modelock xinerama"
+IUSE="gif gnustep jpeg nls png tiff modelock +vdesktop xinerama"
 DEPEND="x11-libs/libXv
 	x11-libs/libXft
 	x11-libs/libXt
@@ -127,7 +129,8 @@ src_compile() {
 	fi
 
 	# enable new features, need to be done via defines
-	append-flags -DBOUNCE_APP -DNEWAPPICON -DVIRTUAL_DESKTOP
+	append-flags -DBOUNCE_APP -DNEWAPPICON
+	use vdesktop && append-flags -DVIRTUAL_DESKTOP
 
 	# default settings with $myconf appended
 	econf \