Newer snapshot

Package-Manager: portage-2.1.1_pre5-r1

6 files changed, 188 insertions, 10 deletions

diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog
index 15223a9d9714..2b625ae113cd 100644
--- a/x11-wm/sawfish/ChangeLog
+++ b/x11-wm/sawfish/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/sawfish
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.65 2006/06/15 20:32:59 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.66 2006/08/16 08:08:07 truedfx Exp $
+
+*sawfish-1.3.20060816 (16 Aug 2006)
+
+  16 Aug 2006; Harald van Dijk <truedfx@gentoo.org>
+  +files/sawfish-configure-warning.patch, +files/sawfish-kde-menus.patch,
+  +sawfish-1.3.20060816.ebuild:
+  Newer snapshot, with patch for KDE menus
 
   15 Jun 2006; Harald van Dijk <truedfx@gentoo.org>
   sawfish-1.3.20040120.ebuild, sawfish-1.3.20040120-r1.ebuild,
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index e7a2cd56af9a..400ca8e0fbb3 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -25,13 +25,22 @@ AUX sawfish-1.3-state-below.patch 403 RMD160 2ce7541bd8abafd778f55231a9ca4c52dc1
 MD5 280d364bfd0878351ebbbcbc62ac19c4 files/sawfish-1.3-state-below.patch 403
 RMD160 2ce7541bd8abafd778f55231a9ca4c52dc112798 files/sawfish-1.3-state-below.patch 403
 SHA256 0aaca4e9095283ae21be489eb0b8a4af687f907c13db5bcc8c81d2e61cdc941d files/sawfish-1.3-state-below.patch 403
+AUX sawfish-configure-warning.patch 664 RMD160 8f3b97f097b0b7fabbe423e6a50a115609e63089 SHA1 64d4e85232e70a6a776ba3c2e4539ab969920869 SHA256 f066854fc4f7f5f2eeea5326823dc5c378149a27061e1fc79c8d077b57625ffc
+MD5 f87e36138582f62279f1523bb4f40d08 files/sawfish-configure-warning.patch 664
+RMD160 8f3b97f097b0b7fabbe423e6a50a115609e63089 files/sawfish-configure-warning.patch 664
+SHA256 f066854fc4f7f5f2eeea5326823dc5c378149a27061e1fc79c8d077b57625ffc files/sawfish-configure-warning.patch 664
+AUX sawfish-kde-menus.patch 635 RMD160 f390016c0d7908c6f603f77fc62154a537a024fb SHA1 cec207f6c39219d50cb5a1a5482962ced81389ff SHA256 7d6aa665ca40834897de6bc52ff4b1818e2a3fe522a8f4529d6746e761a59c40
+MD5 9340bba6b0d119cbb2d9e17135f4bc57 files/sawfish-kde-menus.patch 635
+RMD160 f390016c0d7908c6f603f77fc62154a537a024fb files/sawfish-kde-menus.patch 635
+SHA256 7d6aa665ca40834897de6bc52ff4b1818e2a3fe522a8f4529d6746e761a59c40 files/sawfish-kde-menus.patch 635
 AUX sawfish-xft-menu-utf8.patch 6130 RMD160 6ae34f6fd972ddaf7057e363ad7a55bbf2717241 SHA1 34f750cffc90561761937bb888f565e86aaf1bbe SHA256 2cc54204aa4027cfe0161394e4e486f58c33fec49fc0f6fea33b95ce8503c271
 MD5 b77a24813c32d264f4d1b8faa066b716 files/sawfish-xft-menu-utf8.patch 6130
 RMD160 6ae34f6fd972ddaf7057e363ad7a55bbf2717241 files/sawfish-xft-menu-utf8.patch 6130
 SHA256 2cc54204aa4027cfe0161394e4e486f58c33fec49fc0f6fea33b95ce8503c271 files/sawfish-xft-menu-utf8.patch 6130
 DIST sawfish-1.0.1.tar.gz 1326727 RMD160 4a073bb33bee9a7502e9b645e8064ae1dad8314c SHA256 a0b0f6d76ed1bbd765a8bf0c48dc8853a53009b874116ceed700193e6bd62e62
 DIST sawfish-1.3.20040120.tar.bz2 1108560 RMD160 c95594d08f56ce72d847b54240b32a2c8bc5b77d SHA256 883d393bb813a642141d926487502b67cba47771b8d8c0b15333bb6eb7dad679
-DIST sawfish-1.3.20050816.tar.bz2 1145082 RMD160 e15e222baa1f1f52f085f4658abc3d8a37d6c8e8 SHA256 2b4954f1605e985dba5d71fafd57c4d2914bd7e0b19941c3b937915772fc98f3
+DIST sawfish-1.3.20050816.tar.bz2 1145082 RMD160 e15e222baa1f1f52f085f4658abc3d8a37d6c8e8 SHA1 a53222bbbd84557c66644a3767f724952ed9730c SHA256 2b4954f1605e985dba5d71fafd57c4d2914bd7e0b19941c3b937915772fc98f3
+DIST sawfish-1.3.20060816.tar.bz2 1172610 RMD160 a4f02524f398c5de8e09e6148621dd42aca90a7d SHA1 9192dbbf43d785ed2978c3de05236dfced097485 SHA256 81672a37c0e1a27ef14588808bb005c155876c3d4394f1edc251ceaa300d2798
 EBUILD sawfish-1.0.1-r6.ebuild 2017 RMD160 11af34ff727e328deba88bcbd5a49d87c660f397 SHA1 35a17b9888ec1b19f673d7725e5abf83cec4f05a SHA256 8298e1ff84808b71ccf70ea238b667d3fcd55b0a4dba20e76d6bfcc68c1b75ed
 MD5 eb5d859670c6ea8a0904662860c180b0 sawfish-1.0.1-r6.ebuild 2017
 RMD160 11af34ff727e328deba88bcbd5a49d87c660f397 sawfish-1.0.1-r6.ebuild 2017
@@ -52,10 +61,14 @@ EBUILD sawfish-1.3.20050816.ebuild 2719 RMD160 7801c83e499c4f1742ca288598b805de5
 MD5 90bf1f21dfdd1a4cc36cfa3b7055a07c sawfish-1.3.20050816.ebuild 2719
 RMD160 7801c83e499c4f1742ca288598b805de53d6d5cb sawfish-1.3.20050816.ebuild 2719
 SHA256 188a3c87e66ff26e02ceea57318f577d5117ed9f470516ddd09715a1de49d1c1 sawfish-1.3.20050816.ebuild 2719
-MISC ChangeLog 10725 RMD160 0335349f5d800dc16db2ee76f4ec9bfa7987e692 SHA1 4a3fe0a8c448192cca56de0d47051c313c58a491 SHA256 ae9030aa3b1aa1e4f720fb51d54ab2eefe1e14da448346ec708c2b4653d4c086
-MD5 da921a0323d9a68e342b3524f25ffbf1 ChangeLog 10725
-RMD160 0335349f5d800dc16db2ee76f4ec9bfa7987e692 ChangeLog 10725
-SHA256 ae9030aa3b1aa1e4f720fb51d54ab2eefe1e14da448346ec708c2b4653d4c086 ChangeLog 10725
+EBUILD sawfish-1.3.20060816.ebuild 3068 RMD160 3f4a7f096cc4f872867f3e185cb84918df3046c1 SHA1 3a05b0b72f5b5db6bb70f890ad53fc2137e1496b SHA256 2d9cabb87f543eb84818d85bd77da12b9c2f056f4be5010273853a4664b63ccd
+MD5 999524ee502df0b04b27eb1488bd645e sawfish-1.3.20060816.ebuild 3068
+RMD160 3f4a7f096cc4f872867f3e185cb84918df3046c1 sawfish-1.3.20060816.ebuild 3068
+SHA256 2d9cabb87f543eb84818d85bd77da12b9c2f056f4be5010273853a4664b63ccd sawfish-1.3.20060816.ebuild 3068
+MISC ChangeLog 10964 RMD160 ab939201ed44801d4102b584b24289b5c4e8f4df SHA1 4361d42c5649350974731dacf94f16f8e97f5244 SHA256 f0c8c9d0c8b68fe3fdf4740b1b81d495dc9a6c308585461ab768dccbd578a025
+MD5 0bc655fc5a7432744caa6c717faf9fbc ChangeLog 10964
+RMD160 ab939201ed44801d4102b584b24289b5c4e8f4df ChangeLog 10964
+SHA256 f0c8c9d0c8b68fe3fdf4740b1b81d495dc9a6c308585461ab768dccbd578a025 ChangeLog 10964
 MISC metadata.xml 252 RMD160 e1e9d40a05f958564b97dce796d3575508fb3b2e SHA1 f0acfb091052a67f482b06271d0ff89796dded07 SHA256 0db1ac5dbd8480024e1398a144440c9f0b77d5edf03789905ed31ae1d284aaf2
 MD5 683a44340139387ede0f0a8ec990f6af metadata.xml 252
 RMD160 e1e9d40a05f958564b97dce796d3575508fb3b2e metadata.xml 252
@@ -75,10 +88,13 @@ SHA256 bfb44f484f8df1fa3ec2a606c7d52d54aa7e495d08f391119f21c8b830e6bfcf files/di
 MD5 6d7e350ed295076a1d0594e3c002aefc files/digest-sawfish-1.3.20050816-r1 268
 RMD160 166266b6b60e33d9b9208a71f758abd4b8287690 files/digest-sawfish-1.3.20050816-r1 268
 SHA256 bfb44f484f8df1fa3ec2a606c7d52d54aa7e495d08f391119f21c8b830e6bfcf files/digest-sawfish-1.3.20050816-r1 268
+MD5 99dabe5f9c08d10c8f669cb3a47b1a09 files/digest-sawfish-1.3.20060816 268
+RMD160 dcee73d6b3ab66783e702abe105582cc85e0de25 files/digest-sawfish-1.3.20060816 268
+SHA256 28d87598d8af8244e47218422eb9ab7f7f27788fb9e1b7e8b0abdf1200c3193e files/digest-sawfish-1.3.20060816 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEkcR8wnQyISwouHwRApTIAKDEKJMqf5bzXV5m3FtzxB4hl1VK2QCeOiZZ
-C9aY6aHKdke+kRg9IlLpMLU=
-=9vLx
+iD4DBQFE4tMywnQyISwouHwRAqBuAJiEeyHn3G/prEwt3R1tfnvujtM3AJ9uALp0
+NNBn7oZQtUxbQneSS6nCtw==
+=Ebgb
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/sawfish/files/digest-sawfish-1.3.20060816 b/x11-wm/sawfish/files/digest-sawfish-1.3.20060816
new file mode 100644
index 000000000000..99ef81836870
--- /dev/null
+++ b/x11-wm/sawfish/files/digest-sawfish-1.3.20060816
@@ -0,0 +1,3 @@
+MD5 af0087d24dee707c16308b2a5733c8bd sawfish-1.3.20060816.tar.bz2 1172610
+RMD160 a4f02524f398c5de8e09e6148621dd42aca90a7d sawfish-1.3.20060816.tar.bz2 1172610
+SHA256 81672a37c0e1a27ef14588808bb005c155876c3d4394f1edc251ceaa300d2798 sawfish-1.3.20060816.tar.bz2 1172610
diff --git a/x11-wm/sawfish/files/sawfish-configure-warning.patch b/x11-wm/sawfish/files/sawfish-configure-warning.patch
new file mode 100644
index 000000000000..2f3c55c3c080
--- /dev/null
+++ b/x11-wm/sawfish/files/sawfish-configure-warning.patch
@@ -0,0 +1,20 @@
+--- sawfish/configure.in
++++ sawfish/configure.in
+@@ -90,7 +90,7 @@
+ _cppflags="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
+ 
+-AC_CHECK_HEADERS(X11/SM/SMlib.h X11/extensions/Xdbe.h)
++AC_CHECK_HEADERS(X11/SM/SMlib.h X11/extensions/Xdbe.h,,,[#include <X11/Xlib.h>])
+ 
+ dnl Checks for X extensions/libraries
+ XINERAMA_LIBS=""
+@@ -110,7 +110,7 @@
+ 
+ AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
+ 	     [XRANDR_LIBS="-lXrandr"
+-	      AC_CHECK_HEADERS(X11/extensions/Xrandr.h)],
++	      AC_CHECK_HEADERS(X11/extensions/Xrandr.h,,,[#include <X11/Xlib.h>])],
+ 	     [],[$X_LIBS -lX11 -lXext])
+ 
+ dnl Try using pkg-config first, since it looks like Xft2 may fail our
diff --git a/x11-wm/sawfish/files/sawfish-kde-menus.patch b/x11-wm/sawfish/files/sawfish-kde-menus.patch
new file mode 100644
index 000000000000..5e3e2125a4b0
--- /dev/null
+++ b/x11-wm/sawfish/files/sawfish-kde-menus.patch
@@ -0,0 +1,22 @@
+This patch comes from sawfish-mmc. Without it, opening
+a menu in KDE deactivates the current window.
+
+--- sawfish/src/events.c
++++ sawfish/src/events.c
+@@ -955,11 +955,15 @@
+     Lisp_Window *w = find_window_by_id (ev->xfocus.window);
+     if (ev->xfocus.detail == NotifyPointer)
+ 	return;
++    if (ev->xfocus.mode == NotifyGrab || ev->xfocus.mode == NotifyUngrab)
++	return;
+     if (w != 0 && ev->xfocus.detail != NotifyInferior)
+     {
+ 	if (focus_window == w)
+ 	{
+-	    focus_window = 0;
++	    if (ev->xfocus.mode == NotifyNormal || ev->xfocus.mode == NotifyWhileGrabbed)
++		focus_window = 0;
++
+ 	    report_focus_change (w);
+ 	}
+ 
diff --git a/x11-wm/sawfish/sawfish-1.3.20060816.ebuild b/x11-wm/sawfish/sawfish-1.3.20060816.ebuild
new file mode 100644
index 000000000000..de565960fe9b
--- /dev/null
+++ b/x11-wm/sawfish/sawfish-1.3.20060816.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20060816.ebuild,v 1.1 2006/08/16 08:08:07 truedfx Exp $
+
+# detect cvs snapshots; fex. 1.3.20040120
+[[ $PV == *.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] ]]
+(( snapshot = !$? ))
+
+inherit eutils
+
+DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
+HOMEPAGE="http://sawmill.sourceforge.net/"
+if (( snapshot )); then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else
+	SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="gnome esd nls audiofile pango"
+
+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-0.2.3 )
+	esd? ( >=media-sound/esound-0.2.23 )
+	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
+
+if (( snapshot )); then
+	DEPEND="${DEPEND}
+		sys-devel/automake
+		sys-devel/autoconf"
+	S="${WORKDIR}/${PN}"
+fi
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/libtool.patch"
+	# Fix configure warning about being unable
+	# to compile with <Xdbe.h> and <Xrandr.h>
+	epatch "${FILESDIR}"/sawfish-configure-warning.patch
+	# Fix utf8 with xft #121772
+	epatch "${FILESDIR}"/sawfish-xft-menu-utf8.patch
+	# Fix KDE menus
+	epatch "${FILESDIR}"/sawfish-kde-menus.patch
+}
+
+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"
+
+	# If this is a snapshot then we need to create the autoconf stuff
+	if (( snapshot )); then
+		aclocal || die "aclocal failed"
+		autoconf || die "autoconf failed"
+	fi
+
+	set -- \
+		--disable-themer \
+		--with-gdk-pixbuf \
+		$(use_with audiofile) \
+		$(use_with esd) \
+		$(use_with pango)
+
+	if use gnome; then
+		set -- "$@" \
+			--with-gnome-prefix=/usr \
+			--enable-gnome-widgets \
+			--enable-capplet
+	else
+		set -- "$@" \
+			--disable-gnome-widgets \
+			--disable-capplet
+	fi
+
+	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
+
+	# Parallel build doesn't work
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS BUGS ChangeLog DOC FAQ NEWS README THANKS TODO OPTIONS
+	newdoc src/ChangeLog ChangeLog.src
+}