Version bump, make libXinerama support optional (#311131)

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

3 files changed, 103 insertions, 1 deletions

diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog
index c7d606bb54ce..44835cc27081 100644
--- a/x11-wm/sawfish/ChangeLog
+++ b/x11-wm/sawfish/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/sawfish
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.92 2010/03/24 18:25:54 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.93 2010/03/28 19:43:37 truedfx Exp $
+
+*sawfish-1.6.2 (28 Mar 2010)
+
+  28 Mar 2010; Harald van Dijk <truedfx@gentoo.org> +sawfish-1.6.2.ebuild,
+  +files/sawfish-1.6.2-xinerama.patch:
+  Version bump, make libXinerama support optional (#311131)
 
   24 Mar 2010; Harald van Dijk <truedfx@gentoo.org> sawfish-1.5.3.ebuild:
   Add libXinerama to (R)DEPEND, bug #311131
diff --git a/x11-wm/sawfish/files/sawfish-1.6.2-xinerama.patch b/x11-wm/sawfish/files/sawfish-1.6.2-xinerama.patch
new file mode 100644
index 000000000000..747c96f2b85e
--- /dev/null
+++ b/x11-wm/sawfish/files/sawfish-1.6.2-xinerama.patch
@@ -0,0 +1,20 @@
+--- sawfish-1.6.2/configure.in
++++ sawfish-1.6.2/configure.in
+@@ -81,11 +81,17 @@
+ XFT_LIBS=""
+ XFT_CFLAGS=""
+ 
++AC_ARG_WITH([xinerama], [AS_HELP_STRING([--with-xinerama], [Include Xinerama support])], [], [with_xinerama=yes])
++
++if test "$with_xinerama" != "no"; then
++
+ PKG_CHECK_MODULES(libXineRama, xinerama >= 1.0
+ 		  ,XINERAMA_LIBS="-lXinerama"
+ 		  AC_DEFINE(HAVE_X11_EXTENSIONS_XINERAMA_H, 1, [Have xinerama])
+ 		  ,AC_MSG_ERROR([cannot locate libXineRama]))
+ 
++fi
++
+ PKG_CHECK_MODULES(libXRandR, xrandr >= 1.0
+ 		  ,XRANDR_LIBS="-lXrandr"
+ 		  AC_DEFINE(HAVE_X11_EXTENSIONS_XRANDR_H, 1, [Have xrandr])
diff --git a/x11-wm/sawfish/sawfish-1.6.2.ebuild b/x11-wm/sawfish/sawfish-1.6.2.ebuild
new file mode 100644
index 000000000000..421fbac90740
--- /dev/null
+++ b/x11-wm/sawfish/sawfish-1.6.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.6.2.ebuild,v 1.1 2010/03/28 19:43:37 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 = !$? ))
+
+#if (( snapshot )); then
+	inherit eutils autotools
+#else
+#	inherit eutils
+#fi
+
+DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
+HOMEPAGE="http://sawfish.wikia.com/"
+if (( snapshot )); then
+	SRC_URI="mirror://gentoo/${P/_p/.}.tar.bz2"
+else
+	SRC_URI="http://download.tuxfamily.org/sawfish/sawfish/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-2 Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls xinerama"
+
+RDEPEND=">=dev-libs/librep-0.90.5
+	>=x11-libs/rep-gtk-0.90.2
+	>=x11-libs/pango-1.8.0
+	>=x11-libs/gtk+-2.12.0
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0"
+
+if (( snapshot )); then
+	S="${WORKDIR}/${PN}"
+fi
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-xinerama.patch
+
+	#if (( snapshot )); then
+		eautoreconf
+	#fi
+}
+
+src_compile() {
+	set -- \
+		$(use_with xinerama) \
+		--with-gdk-pixbuf
+
+	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"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog DOC FAQ NEWS OPTIONS README README.IMPORTANT TODO
+}