Resurrect sawfish-1.0.1-r6 instead of sawfish-1.2, since gnome-1 depends on

<x11-wm/sawfish-1.2
Package-Manager: portage-2.0.51.22-r1

6 files changed, 107 insertions, 95 deletions

diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog
index 62959a385a6d..856cd8b78311 100644
--- a/x11-wm/sawfish/ChangeLog
+++ b/x11-wm/sawfish/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/sawfish
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.51 2005/06/23 03:51:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.52 2005/06/23 13:14:46 agriffis Exp $
+
+  23 Jun 2005; Aron Griffis <agriffis@gentoo.org> +sawfish-1.0.1-r6.ebuild,
+  -sawfish-1.2.ebuild:
+  Resurrect sawfish-1.0.1-r6 instead of sawfish-1.2, since gnome-1 depends on
+  <x11-wm/sawfish-1.2
 
   23 Jun 2005; Aron Griffis <agriffis@gentoo.org> +sawfish-1.2.ebuild:
   Resurrect sawfish-1.2 for gnome-1
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 59a780333141..882062586276 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 18284928e8abd3bec8fb4ac6cd7011f3 ChangeLog 8222
-MD5 caeb1eaaf77305901f5c3bc19f3637d5 files/Sawfish.desktop 449
-MD5 1ae747636b3422e00ef41cc07fc37ab4 files/capplet-crash.patch 556
-MD5 9f3ef60fed1887a92eaa83e57f84e29a files/digest-sawfish-1.2 69
+MD5 2dfef4a3fc9332df431ea0b2b06c5ee8 sawfish-1.3.20040120.ebuild 2700
+MD5 eb5d859670c6ea8a0904662860c180b0 sawfish-1.0.1-r6.ebuild 2017
+MD5 d867afc4d147fd720bf9339531e21fe3 ChangeLog 8422
+MD5 87cb07e2d3612bc798e3722f4f882671 metadata.xml 250
+MD5 e6493e3574c0b7c882ace118216ae64a sawfish-1.3.20040120-r1.ebuild 2633
 MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120 74
-MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120-r1 74
+MD5 caeb1eaaf77305901f5c3bc19f3637d5 files/Sawfish.desktop 449
 MD5 cd8e05ea2ee9e1ff63339dd0b0f021f6 files/sawfish-1.0.1-exec.patch 451
-MD5 479a0928dfaab241c12c7dbf7d06cb4f files/sawfish-1.2-fullscreen.patch 459
 MD5 88c0f86adbddc2cf06588742162c5480 files/sawfish-1.2-gtk+-2.2.patch 471
-MD5 1e1b4b3609f8e62666856d07e393068f files/sawfish-1.3-shading.patch 1198
+MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120-r1 74
+MD5 1ae747636b3422e00ef41cc07fc37ab4 files/capplet-crash.patch 556
 MD5 280d364bfd0878351ebbbcbc62ac19c4 files/sawfish-1.3-state-below.patch 403
-MD5 87cb07e2d3612bc798e3722f4f882671 metadata.xml 250
-MD5 72013bbb7b9ec091077485ccc9b6c939 sawfish-1.2.ebuild 2219
-MD5 e6493e3574c0b7c882ace118216ae64a sawfish-1.3.20040120-r1.ebuild 2633
-MD5 2dfef4a3fc9332df431ea0b2b06c5ee8 sawfish-1.3.20040120.ebuild 2700
+MD5 1e1b4b3609f8e62666856d07e393068f files/sawfish-1.3-shading.patch 1198
+MD5 a7d051180bc14a630027439f0d385dcd files/digest-sawfish-1.0.1-r6 66
+MD5 479a0928dfaab241c12c7dbf7d06cb4f files/sawfish-1.2-fullscreen.patch 459
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCuq5BI1lqEGTUzyQRAnbZAKDZRKdJOHHWKPp6CtQLRDdlC+WMNQCgywAn
-ibXvVynpDewDmgfXMCSzpO8=
-=5a2D
+iD8DBQFCurXZBXaUFmZvwyMRAl8mAKC/rWsbHWyFgic+bp2x+g5qtN+E9gCfZ9l2
+ycUP5fQNeGwPeAkbfvSobis=
+=0Fph
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/sawfish/files/digest-sawfish-1.0.1-r6 b/x11-wm/sawfish/files/digest-sawfish-1.0.1-r6
new file mode 100644
index 000000000000..3592e2b26ab4
--- /dev/null
+++ b/x11-wm/sawfish/files/digest-sawfish-1.0.1-r6
@@ -0,0 +1 @@
+MD5 b1587ea76cca08ec951f2536c17a307e sawfish-1.0.1.tar.gz 1326727
diff --git a/x11-wm/sawfish/files/digest-sawfish-1.2 b/x11-wm/sawfish/files/digest-sawfish-1.2
deleted file mode 100644
index 0941e220244d..000000000000
--- a/x11-wm/sawfish/files/digest-sawfish-1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bab6b11a6e7af758606d53cb44b003ab sawfish-1.2-gtk2.tar.gz 1574246
diff --git a/x11-wm/sawfish/sawfish-1.0.1-r6.ebuild b/x11-wm/sawfish/sawfish-1.0.1-r6.ebuild
new file mode 100644
index 000000000000..40dba39e0db3
--- /dev/null
+++ b/x11-wm/sawfish/sawfish-1.0.1-r6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.0.1-r6.ebuild,v 1.16 2005/06/23 13:14:46 agriffis Exp $
+
+IUSE="gtk nls esd gnome"
+
+DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
+SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz"
+HOMEPAGE="http://sawmill.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc -ppc alpha"
+
+DEPEND="=x11-libs/rep-gtk-0.15*
+	>=dev-libs/librep-0.14
+	>=media-libs/imlib-1.9.10-r1
+	esd? ( >=media-sound/esound-0.2.22 )
+	gtk? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )
+	gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1
+		>=media-libs/gdk-pixbuf-0.11.0-r1 )"
+
+RDEPEND="${DEPEND}
+	=x11-libs/gtk+-1*
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	patch -p0 <${FILESDIR}/capplet-crash.patch || die
+	#fix buggy Makefile with newer libtool
+	patch -p0 <${FILESDIR}/sawfish-${PV}-exec.patch || die
+
+	#update libtool for "relink" bug fix
+	libtoolize --copy --force
+	aclocal
+}
+
+src_compile() {
+
+	local myconf
+
+	use esd \
+		&& myconf="--with-esd" \
+		|| myconf="--without-esd"
+
+	use gnome \
+		&& myconf="${myconf} --with-gnome-prefix=/usr --enable-gnome-widgets --enable-capplet" \
+		|| myconf="${myconf} --disable-gnome-widgets --disable-capplet"
+
+	use nls || myconf="${myconf} --disable-linguas"
+
+	use gtk || use gnome \
+		&& myconf="${myconf} --with-gdk-pixbuf" \
+		|| myconf="${myconf} --without-gdk-pixbuf"
+
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--libexecdir=/usr/lib \
+		--with-audiofile \
+		${myconf} || die
+
+	# see bug #4728
+	MAKEOPTS="-j1" emake || die
+}
+
+src_install() {
+
+	make DESTDIR=${D} \
+		install || die
+
+	use nls || rmdir ${D}/usr/share/locale
+
+	dodoc AUTHORS BUGS COPYING ChangeLog
+	dodoc DOC FAQ NEWS README THANKS TODO
+
+	# Add to Gnome CC's Window Manager list
+	if use gnome
+	then
+		insinto /usr/share/gnome/wm-properties
+		doins ${FILESDIR}/Sawfish.desktop
+	fi
+}
diff --git a/x11-wm/sawfish/sawfish-1.2.ebuild b/x11-wm/sawfish/sawfish-1.2.ebuild
deleted file mode 100644
index 34a878424e1f..000000000000
--- a/x11-wm/sawfish/sawfish-1.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.2.ebuild,v 1.19 2005/06/23 12:42:19 swegener Exp $
-
-inherit base eutils
-
-IUSE="readline esd nls"
-
-MY_P="${P}-gtk2"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
-SRC_URI="mirror://sourceforge/sawmill/${MY_P}.tar.gz"
-HOMEPAGE="http://sawmill.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 alpha -ppc"
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	>=x11-libs/rep-gtk-0.17
-	>=dev-libs/librep-0.16
-	>=media-libs/imlib-1.9.10-r1
-	media-libs/audiofile
-	>=x11-libs/gtk+-2.0.8
-	esd? ( >=media-sound/esound-0.2.22 )
-	readline? ( >=sys-libs/readline-4.1 )
-	nls? ( sys-devel/gettext )"
-
-
-src_unpack() {
-	base_src_unpack
-
-	cd ${S}; epatch ${FILESDIR}/sawfish-1.2-fullscreen.patch
-	# Fixes gtk 2.2 being detected as 1.x
-	epatch ${FILESDIR}/sawfish-1.2-gtk+-2.2.patch
-}
-
-src_compile() {
-
-	local myconf=""
-	use esd && myconf="${myconf} --with-esd"
-	use esd || myconf="${myconf} --without-esd"
-
-	use readline && myconf="${myconf} --with-readline"
-	use readline || myconf="${myconf} --without-readline"
-
-	use nls || myconf="${myconf} --disable-linguas"
-
-	# Make sure we include freetype2 headers before freetype1 headers, else Xft2
-	# borks,
-	# <azarah@gentoo.org> (13 Dec 2002)
-	export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
-	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
-
-	# The themer is currently broken (must have rep-gtk-0.15
-	# installed to get it compiled) - Azarah, 24 Jun 2002
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--libexecdir=/usr/lib \
-		--with-gnome-prefix=/usr \
-		--enable-gnome-widgets \
-		--enable-capplet \
-		--disable-themer \
-		--with-gdk-pixbuf \
-		--with-audiofile \
-		${myconf} || die
-
-	# DO NOT USE "emake" !!! - Azarah, 24 Jun 2002
-	MAKEOPTS=-j1 make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS COPYING ChangeLog DOC FAQ NEWS README THANKS TODO
-
-	# Add to Gnome CC's Window Manager list
-	insinto /usr/share/gnome/wm-properties
-	doins ${FILESDIR}/Sawfish.desktop
-}