Version bumps

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 119 insertions, 2 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/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
+}