Version bumps

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 123 insertions, 13 deletions

diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog
index 9323fa2034d4..c7757a137464 100644
--- a/x11-wm/sawfish/ChangeLog
+++ b/x11-wm/sawfish/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/sawfish
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.89 2008/10/06 17:13:50 truedfx Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.90 2009/03/08 20:06:33 truedfx Exp $
+
+*sawfish-1.3.5.2 (08 Mar 2009)
+
+  08 Mar 2009; Harald van Dijk <truedfx@gentoo.org>
+  +files/sawfish-1.3.5.2-pangoxft.patch, +sawfish-1.3.5.2.ebuild:
+  Version bump
 
   06 Oct 2008; Harald van Dijk <truedfx@gentoo.org>
   +files/sawfish-1.3.3-cflags.patch, sawfish-1.3.3.ebuild:
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 5e11bdc06ca6..b69e203c1c88 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libtool.patch 798 RMD160 ce31c467c17f0106abee438271f723c888eec641 SHA1 8a0647bdd8db1256464f61e76f2deafd7b546ef3 SHA256 5d2a78d80ce22591c930353be21e359c542d6b241700efac5a38c1c41864c9c2
 AUX sawfish-1.3.3-cflags.patch 392 RMD160 4e1bb62ff643e605e14de1fba03e34e0ea86799b SHA1 7fc71042af7a0d0b5644da641fcd856f80d7b0c6 SHA256 589c2674e3d2ca77864494b2f9e5096365485940adda1115bd69809bbfc625ba
 AUX sawfish-1.3.3-parallel-make.patch 285 RMD160 82a87c1941809d57f266568e67e09568ea6f6a3f SHA1 94ab12d982fe219a443ce427e27dee0f591a9a20 SHA256 18e8115f21a1e26cf4a29b70f720182eb64132818e16b167aca515e9629ecd82
+AUX sawfish-1.3.5.2-pangoxft.patch 752 RMD160 c7168432370d877e343eb4361ee6d1ab4a0cf6f9 SHA1 ee8a091abe117be679273ba91e0f9db552d58486 SHA256 6de197dcaac83403745cc4bd3aaa699321f4a8b411f47e52b18953459feed951
 DIST sawfish-1.3.3.tar.gz 1805122 RMD160 82f11163013c711559fe48e51a85ff9926086faf SHA1 3a77267cc8a2032a5a0810070b2a200fe4961250 SHA256 3040baecd4a521f02067fef5de9e4e03f4eeb95ce2d29dfdabbdca62ccfedb30
+DIST sawfish-1.3.5.2.tar.bz2 1545082 RMD160 cb0424c737fdcd9a55bd72378e621de157b5215d SHA1 996feeae0a7b8976d0f19c05eb4efbe3ecfbfeff SHA256 66d5fcabb01df82d5f529fbc604cdc7dc36c781e18bc13ff9b6533e8049aadc8
 EBUILD sawfish-1.3.3.ebuild 2714 RMD160 71ad2311f829e99311081bb8ad60e6b58a016b93 SHA1 59e9d285b2f6e7df8831038b10cb5fca02868e79 SHA256 7e7564bf2094f9d963b78b2ea2d83125a6aa4d3128551b6a9f60a24125700cb8
-MISC ChangeLog 14362 RMD160 669cd139bdea1a55b4c9c7b0d649e81a2ebefcab SHA1 76c156a647a3f350f89aa3a5e7402c5ebc15d2c2 SHA256 d70ab0adf13331dfb66bc076a1f3e4598db1697d369980730c65ff3785889070
+EBUILD sawfish-1.3.5.2.ebuild 2502 RMD160 23579a70cac1cd90110bdbdd9436a16077d82a2b SHA1 bd761634033cd8f05cb540924092bb30de0bd91b SHA256 79e42d4348d68114528f92b06b6188f0a47f532e6ae1006471a5f0da9c8a2e4f
+MISC ChangeLog 14528 RMD160 666580721d72a0e2ef6d039e6d3a9eadcfec0eca SHA1 2350762a0abab415c13c68016fa2fca8a8fcb497 SHA256 08803817af739aa1ea15d7caca61db85f18cb723cf87a274e0bdaa6a1f4849f4
 MISC metadata.xml 330 RMD160 a977dcda5e912a533c1cc2365fa7413979c3fac0 SHA1 954e2921eb971bc5ce6c6b4430e43f85afd0ace3 SHA256 fc1fa7121a60e9ac480975545350f64aee5ad648a89b99ee2b19cdb78888741b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjqR2EACgkQwnQyISwouHx0VACfXiVaGOfbmmE8rh6qFSRmHxx1
-rkwAnRlHuCA8CZ7TxgAnMQSU8ObGDFbQ
-=hF8p
------END PGP SIGNATURE-----
diff --git a/x11-wm/sawfish/files/sawfish-1.3.5.2-pangoxft.patch b/x11-wm/sawfish/files/sawfish-1.3.5.2-pangoxft.patch
new file mode 100644
index 000000000000..f335cba1b4da
--- /dev/null
+++ b/x11-wm/sawfish/files/sawfish-1.3.5.2-pangoxft.patch
@@ -0,0 +1,21 @@
+--- sawfish-1.3.5.2/configure.in
++++ sawfish-1.3.5.2/configure.in
+@@ -134,15 +134,15 @@
+ dnl Checks for pango
+ PKG_CHECK_MODULES(PANGO, pango >= 1.8.0,
+   [if $PKG_CONFIG --exists pangoxft; then
+-     AC_DEFINE(HAVE_PANGO_XFT, 1)
++     AC_DEFINE(HAVE_PANGO_XFT, 1, [Have pangoxft])
+      PANGO_MODULES="pangoxft pangox"
+      dnl for sawfish.gtk.widgets.font
+      have_pango_xft=yes
+      AC_SUBST(have_pango_xft)
+    fi
+    if test "x$PANGO_MODULES" != x; then
+-     AC_DEFINE(HAVE_PANGO, 1)
++     AC_DEFINE(HAVE_PANGO, 1, [Have pango])
+-     AC_DEFINE(HAVE_PANGO_X, 1)
++     AC_DEFINE(HAVE_PANGO_X, 1, [Have pangox])
+      PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_MODULES`
+      PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_MODULES`
+    fi], [: nothing])
diff --git a/x11-wm/sawfish/sawfish-1.3.5.2.ebuild b/x11-wm/sawfish/sawfish-1.3.5.2.ebuild
new file mode 100644
index 000000000000..a13adca1d05b
--- /dev/null
+++ b/x11-wm/sawfish/sawfish-1.3.5.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.5.2.ebuild,v 1.1 2009/03/08 20:06:33 truedfx Exp $
+
+# detect cvs snapshots; fex. 1.3_p20040120
+[[ $PV == *_p[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] ]]
+(( snapshot = !$? ))
+
+# 1.3.5.2 was released with a broken config.h.in
+#if (( snapshot )); then
+	inherit eutils autotools
+#else
+#	inherit eutils
+#fi
+
+DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
+HOMEPAGE="http://sawmill.sourceforge.net/"
+if (( snapshot )); then
+	SRC_URI="mirror://gentoo/${P/_p/.}.tar.bz2"
+else
+	SRC_URI="mirror://sourceforge/sawmill/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="esd nls audiofile"
+
+RDEPEND=">=x11-libs/rep-gtk-0.18.4
+	>=dev-libs/librep-0.17.3
+	>=x11-libs/gtk+-2.0.8
+	audiofile? ( >=media-libs/audiofile-0.2.3 )
+	esd? ( >=media-sound/esound-0.2.23 )
+	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0"
+
+if (( snapshot )); then
+	S="${WORKDIR}/${PN}"
+fi
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.3.3-cflags.patch
+	epatch "${FILESDIR}"/${P}-pangoxft.patch
+
+	#if (( snapshot )); then
+		eautoreconf
+	#fi
+}
+
+src_compile() {
+	# 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"
+
+	set -- \
+		--with-gdk-pixbuf \
+		$(use_with audiofile) \
+		$(use_with esd)
+
+	if ! use nls; then
+		# Use a space because configure script reads --enable-linguas="" as
+		# "install everything"
+		# Don't use --disable-linguas, because that means --enable-linguas="no",
+		# which means "install Norwegian translations"
+		set -- "$@" --enable-linguas=" "
+	elif [[ "${LINGUAS+set}" == "set" ]]; then
+		strip-linguas -i po
+		set -- "$@" --enable-linguas=" ${LINGUAS} "
+	else
+		set -- "$@" --enable-linguas=""
+	fi
+
+	econf "$@" || die "configure failed"
+
+	# 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
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS BUGS ChangeLog DOC FAQ NEWS README THANKS TODO OPTIONS
+	newdoc src/ChangeLog ChangeLog.src
+}