Version bump, make libXinerama support optional (#311131)

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

4 files changed, 110 insertions, 5 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/Manifest b/x11-wm/sawfish/Manifest
index f3848f5051d5..671e694d9e0e 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -5,18 +5,21 @@ AUX libtool.patch 798 RMD160 ce31c467c17f0106abee438271f723c888eec641 SHA1 8a064
 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
+AUX sawfish-1.6.2-xinerama.patch 612 RMD160 f547b6574899fcab6a64bcfc6d8e2677b8bea2cc SHA1 b3a199428e9f2d39b51fdcd80114dd57960eab8d SHA256 c4dcf430f45edc776a74b2da2896dabc7a14db81ebb380d798a4ef8558518f20
 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
 DIST sawfish-1.5.3.tar.bz2 3691550 RMD160 98b8170968b8789bb0258c33f9fd855625d1d1d7 SHA1 513359d801a962cee56b15014627d44b86e4071c SHA256 a2dfdd1b83217c7eeecd8726cde39bb74b2856660b9dc45413d8df450ac547a2
+DIST sawfish-1.6.2.tar.bz2 3712666 RMD160 db453dd4a46f87114ffd30287685045ffad437bb SHA1 af50d827be75277dfc0860d20bcbb085f4a53f3b SHA256 05f04583f64263244424a0da6f43610f5169f37ae8de382bbb82018ee82654b4
 EBUILD sawfish-1.3.3.ebuild 2714 RMD160 71ad2311f829e99311081bb8ad60e6b58a016b93 SHA1 59e9d285b2f6e7df8831038b10cb5fca02868e79 SHA256 7e7564bf2094f9d963b78b2ea2d83125a6aa4d3128551b6a9f60a24125700cb8
 EBUILD sawfish-1.3.5.2.ebuild 2502 RMD160 23579a70cac1cd90110bdbdd9436a16077d82a2b SHA1 bd761634033cd8f05cb540924092bb30de0bd91b SHA256 79e42d4348d68114528f92b06b6188f0a47f532e6ae1006471a5f0da9c8a2e4f
 EBUILD sawfish-1.5.3.ebuild 1958 RMD160 51bff199eee9085c904bc74fbf6759cdc1511447 SHA1 faaa9637b5ca150b5a11b6465493a748ef8e5ed0 SHA256 2e4c575742c8da745f2d3fb6c8147709779200cab56227963c5053876ab9af74
-MISC ChangeLog 14768 RMD160 80fa7875bb1a2e82b513f278ffebfd6f562a75c7 SHA1 35f66316d2fb9f015f42684b84aeec963636c0ed SHA256 530f1925174707fc3e92f4b7632ce4067bc34d70cedfe7cefeb5dd26eb562711
+EBUILD sawfish-1.6.2.ebuild 1923 RMD160 b3e6a735707ceb85cf05991824b6dadf30a9f250 SHA1 aa5ebf0752af333d62d1d91e0c07a22a06b196ed SHA256 eae1bc1e62b268e63a7698865498894621bee6afb18fc0ed663b6ae81980d5ef
+MISC ChangeLog 14973 RMD160 f20adf29212330b64a7433c345378537f4426433 SHA1 8c687dd42afeb73242a628323bc7d9697004ebd8 SHA256 207d1f747cbfadb0058d13f9acbd88b14da4527751067493d67ec694c0e66bc3
 MISC metadata.xml 330 RMD160 a977dcda5e912a533c1cc2365fa7413979c3fac0 SHA1 954e2921eb971bc5ce6c6b4430e43f85afd0ace3 SHA256 fc1fa7121a60e9ac480975545350f64aee5ad648a89b99ee2b19cdb78888741b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuqWVQACgkQwnQyISwouHyaeQCfVeB8LJXjmqd8HxrKRm8PVBSq
-bqEAnRdEHJEoR2D6/6gocNpY1xODnQcG
-=Pe/Z
+iEYEARECAAYFAkuvsacACgkQwnQyISwouHye5QCeM8XQzFpLJw6lXTPD/xW6Kun0
+y48An3lHid6j/E7Q+hO47wW0pRwCpbC6
+=yt4m
 -----END PGP SIGNATURE-----
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
+}