Reduce DEPEND: remove bogus imlib, respect USE=audiofile #84947

(Portage version: 2.0.51.22-r1)

6 files changed, 115 insertions, 96 deletions

diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog
index fa752d73a71f..a5cf7ebe7310 100644
--- a/x11-wm/sawfish/ChangeLog
+++ b/x11-wm/sawfish/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/sawfish
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.49 2004/08/30 19:19:31 pvdabeel Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.50 2005/06/23 02:06:44 agriffis Exp $
+
+*sawfish-1.3.20040120-r1 (23 Jun 2005)
+
+  23 Jun 2005; Aron Griffis <agriffis@gentoo.org> -sawfish-1.0.1-r6.ebuild,
+  +sawfish-1.3.20040120-r1.ebuild:
+  Reduce DEPEND: remove bogus imlib, respect USE=audiofile #84947
 
   30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   sawfish-1.3.20040120.ebuild:
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 7638463876d7..59caa7e6863e 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,13 +1,15 @@
+MD5 2dfef4a3fc9332df431ea0b2b06c5ee8 sawfish-1.3.20040120.ebuild 2700
+MD5 86c05d0893cfa8030a5d810f3bdd8e16 sawfish-1.0.1-r6.ebuild 2017
 MD5 4f3fa7057d2ab0a9d687d21e5caab6e0 ChangeLog 7896
 MD5 87cb07e2d3612bc798e3722f4f882671 metadata.xml 250
-MD5 86c05d0893cfa8030a5d810f3bdd8e16 sawfish-1.0.1-r6.ebuild 2017
-MD5 2dfef4a3fc9332df431ea0b2b06c5ee8 sawfish-1.3.20040120.ebuild 2700
-MD5 caeb1eaaf77305901f5c3bc19f3637d5 files/Sawfish.desktop 449
-MD5 1ae747636b3422e00ef41cc07fc37ab4 files/capplet-crash.patch 556
-MD5 a7d051180bc14a630027439f0d385dcd files/digest-sawfish-1.0.1-r6 66
+MD5 1624b0c08a704aa860d5358aca895dd7 sawfish-1.3.20040120-r1.ebuild 2653
 MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120 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 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
diff --git a/x11-wm/sawfish/files/digest-sawfish-1.0.1-r6 b/x11-wm/sawfish/files/digest-sawfish-1.0.1-r6
deleted file mode 100644
index 3592e2b26ab4..000000000000
--- a/x11-wm/sawfish/files/digest-sawfish-1.0.1-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b1587ea76cca08ec951f2536c17a307e sawfish-1.0.1.tar.gz 1326727
diff --git a/x11-wm/sawfish/files/digest-sawfish-1.3.20040120-r1 b/x11-wm/sawfish/files/digest-sawfish-1.3.20040120-r1
new file mode 100644
index 000000000000..acb3fd319929
--- /dev/null
+++ b/x11-wm/sawfish/files/digest-sawfish-1.3.20040120-r1
@@ -0,0 +1 @@
+MD5 6a5318d0e6372b66fe15af2235d65e7d sawfish-1.3.20040120.tar.bz2 1108560
diff --git a/x11-wm/sawfish/sawfish-1.0.1-r6.ebuild b/x11-wm/sawfish/sawfish-1.0.1-r6.ebuild
deleted file mode 100644
index 38f47db54d7a..000000000000
--- a/x11-wm/sawfish/sawfish-1.0.1-r6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2004 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.14 2004/07/15 01:16:02 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.3.20040120-r1.ebuild b/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild
new file mode 100644
index 000000000000..a86e15e75534
--- /dev/null
+++ b/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild
@@ -0,0 +1,97 @@
+# 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.3.20040120-r1.ebuild,v 1.1 2005/06/23 02:06:44 agriffis Exp $
+
+inherit eutils gnuconfig
+
+IUSE="gnome readline esd nls audiofile"
+
+# detect cvs snapshots; fex. 1.3.20040120
+if [[ $PV == *.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] ]]; then
+	sawfishsnapshot=true
+else
+	sawfishsnapshot=false
+fi
+
+DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
+HOMEPAGE="http://sawmill.sourceforge.net/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+if $sawfishsnapshot; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	S=${WORKDIR}/${PN}
+else
+	SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz"
+	S=${WORKDIR}/${P}
+fi
+
+DEPEND=">=dev-util/pkgconfig-0.12.0
+	>=x11-libs/rep-gtk-0.17
+	>=dev-libs/librep-0.16
+	>=x11-libs/gtk+-2.0.8
+	audiofile? ( media-libs/audiofile )
+	esd? ( >=media-sound/esound-0.2.22 )
+	readline? ( >=sys-libs/readline-4.1 )
+	nls? ( sys-devel/gettext )"
+
+# cvs snapshots require automake/autoconf
+if $sawfishsnapshot; then
+	DEPEND="${DEPEND} sys-devel/automake sys-devel/autoconf"
+fi
+
+src_unpack() {
+	unpack ${A} && cd ${S} || die "unpack failed"
+
+	# This is for alpha, but there's no reason to restrict it
+	gnuconfig_update
+}
+
+src_compile() {
+	local myconf
+
+	# 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"
+
+	# If this is a snapshot then we need to create the autoconf stuff
+	if $sawfishsnapshot; then
+		aclocal || die "aclocal failed"
+		autoconf || die "autoconf failed"
+	fi
+
+	if use gnome; then
+		myconf="--with-gnome-prefix=/usr \
+			--enable-gnome-widgets --enable-capplet"
+	else
+		myconf="--disable-gnome-widgets --disable-capplet"
+	fi
+
+	econf \
+		--enable-themer \
+		--with-gdk-pixbuf \
+		$(useq nls || echo --disable-linguas) \
+		$(use_with audiofile) \
+		$(use_with esd) \
+		$(use_with readline) \
+		${myconf} || die
+
+	# The following two lines allow sawfish to compile with gcc 2.95
+	# (see bug 18294)
+	sed -i -e 's:REP_CFLAGS=:REP_CFLAGS=-I/usr/include/freetype2 :' Makedefs
+
+	# Parallel build doesn't work
+	emake -j1 || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS BUGS COPYING ChangeLog DOC FAQ NEWS README THANKS TODO OPTIONS
+
+	# Add to Gnome CC's Window Manager list
+	if use gnome; then
+		insinto /usr/share/gnome/wm-properties
+		doins ${S}/Sawfish.desktop
+	fi
+}