diff options
author | Harald van Dijk <truedfx@gentoo.org> | 2008-05-20 19:13:51 +0000 |
---|---|---|
committer | Harald van Dijk <truedfx@gentoo.org> | 2008-05-20 19:13:51 +0000 |
commit | 5c99a770e7f944e6ff0669b71ce0bca2a4b8be5a (patch) | |
tree | 7eff891ea0c0239863eb75cca6d80483b8dd0427 /x11-wm/sawfish | |
parent | alpha/ia64/sparc/x86 stable wrt security #222823 (diff) | |
download | historical-5c99a770e7f944e6ff0669b71ce0bca2a4b8be5a.tar.gz historical-5c99a770e7f944e6ff0669b71ce0bca2a4b8be5a.tar.bz2 historical-5c99a770e7f944e6ff0669b71ce0bca2a4b8be5a.zip |
Remove older versions
Package-Manager: portage-2.1.5
Diffstat (limited to 'x11-wm/sawfish')
-rw-r--r-- | x11-wm/sawfish/ChangeLog | 9 | ||||
-rw-r--r-- | x11-wm/sawfish/Manifest | 21 | ||||
-rw-r--r-- | x11-wm/sawfish/files/sawfish-1.3-shading.patch | 28 | ||||
-rw-r--r-- | x11-wm/sawfish/files/sawfish-1.3-state-below.patch | 11 | ||||
-rw-r--r-- | x11-wm/sawfish/files/sawfish-configure-warning.patch | 20 | ||||
-rw-r--r-- | x11-wm/sawfish/files/sawfish-kde-menus.patch | 22 | ||||
-rw-r--r-- | x11-wm/sawfish/files/sawfish-xft-menu-utf8.patch | 243 | ||||
-rw-r--r-- | x11-wm/sawfish/sawfish-1.3_p20050816-r1.ebuild | 104 | ||||
-rw-r--r-- | x11-wm/sawfish/sawfish-1.3_p20060816.ebuild | 109 |
9 files changed, 19 insertions, 548 deletions
diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog index 9670d384405e..51c1b67d3bea 100644 --- a/x11-wm/sawfish/ChangeLog +++ b/x11-wm/sawfish/ChangeLog @@ -1,6 +1,13 @@ # 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.87 2008/05/20 15:26:48 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.88 2008/05/20 19:13:50 truedfx Exp $ + + 20 May 2008; Harald van Dijk <truedfx@gentoo.org> + -files/sawfish-1.3-shading.patch, -files/sawfish-1.3-state-below.patch, + -files/sawfish-configure-warning.patch, -files/sawfish-kde-menus.patch, + -files/sawfish-xft-menu-utf8.patch, -sawfish-1.3_p20050816-r1.ebuild, + -sawfish-1.3_p20060816.ebuild: + Remove older versions 20 May 2008; Raúl Porcel <armin76@gentoo.org> sawfish-1.3.3.ebuild: alpha/ia64/sparc stable wrt #222525 diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest index 9214815f093b..6cb6777ac4a0 100644 --- a/x11-wm/sawfish/Manifest +++ b/x11-wm/sawfish/Manifest @@ -1,15 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX libtool.patch 798 RMD160 ce31c467c17f0106abee438271f723c888eec641 SHA1 8a0647bdd8db1256464f61e76f2deafd7b546ef3 SHA256 5d2a78d80ce22591c930353be21e359c542d6b241700efac5a38c1c41864c9c2 -AUX sawfish-1.3-shading.patch 1198 RMD160 0edaccf2e826962cf47cbbf875a0b83a9d853fae SHA1 7b024a2791f9c6495746fd46ebc751665016ac16 SHA256 a077e71282a4b5a2cddc7555396e8ba2d84fbe9165269009816a318709b7f94d -AUX sawfish-1.3-state-below.patch 403 RMD160 2ce7541bd8abafd778f55231a9ca4c52dc112798 SHA1 8c55d8e015905f0d15d790dfd5bfa6b9a68a0bb1 SHA256 0aaca4e9095283ae21be489eb0b8a4af687f907c13db5bcc8c81d2e61cdc941d AUX sawfish-1.3.3-parallel-make.patch 285 RMD160 82a87c1941809d57f266568e67e09568ea6f6a3f SHA1 94ab12d982fe219a443ce427e27dee0f591a9a20 SHA256 18e8115f21a1e26cf4a29b70f720182eb64132818e16b167aca515e9629ecd82 -AUX sawfish-configure-warning.patch 664 RMD160 8f3b97f097b0b7fabbe423e6a50a115609e63089 SHA1 64d4e85232e70a6a776ba3c2e4539ab969920869 SHA256 f066854fc4f7f5f2eeea5326823dc5c378149a27061e1fc79c8d077b57625ffc -AUX sawfish-kde-menus.patch 635 RMD160 f390016c0d7908c6f603f77fc62154a537a024fb SHA1 cec207f6c39219d50cb5a1a5482962ced81389ff SHA256 7d6aa665ca40834897de6bc52ff4b1818e2a3fe522a8f4529d6746e761a59c40 -AUX sawfish-xft-menu-utf8.patch 6130 RMD160 6ae34f6fd972ddaf7057e363ad7a55bbf2717241 SHA1 34f750cffc90561761937bb888f565e86aaf1bbe SHA256 2cc54204aa4027cfe0161394e4e486f58c33fec49fc0f6fea33b95ce8503c271 -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 DIST sawfish-1.3.3.tar.gz 1805122 RMD160 82f11163013c711559fe48e51a85ff9926086faf SHA1 3a77267cc8a2032a5a0810070b2a200fe4961250 SHA256 3040baecd4a521f02067fef5de9e4e03f4eeb95ce2d29dfdabbdca62ccfedb30 EBUILD sawfish-1.3.3.ebuild 2674 RMD160 ff6813e8a3b7c1134ff1ae10765bb0c29a0f94c0 SHA1 8aceac6ee4614eba6973d5963e08ef27b454b961 SHA256 de918574358ce14da2efa361c95ba263a0f33341373c4bc8fe13a7d2f28815e9 -EBUILD sawfish-1.3_p20050816-r1.ebuild 2833 RMD160 8f28e3c634533e8c6bdbb3f6611c7a9cbaea6d99 SHA1 ad84815e8f40578c9b564a1ff0b7f8d26fb4d09a SHA256 47ff018f25111d45f06b4940d5fe2f8b8fb7e2a0358d120bd80f375431b1bc71 -EBUILD sawfish-1.3_p20060816.ebuild 2952 RMD160 64e7dc34070e1e1923ed02c8cf3655530fb2d858 SHA1 6eba9274407b529cd9756473169a0bfa382bdcc4 SHA256 0886322ecf2eb17036dad306e79b0103293f6f5547cf565dabce35d5e6ccc642 -MISC ChangeLog 13882 RMD160 0ce68234e48476620387721df84ebabe9540ab92 SHA1 65dbcd9dd44c153cbf9bc557894242a98bd0df94 SHA256 b04d601d17c2142e4445c1ec62a9bd7da7c207a9d823c7ad55ac70c5d1e0c923 +MISC ChangeLog 14212 RMD160 0da9388740a3d2f65c1e53c4b70adb4445e3cdbb SHA1 08a82a640c13e41e3870c4ed25522ae93c6556f5 SHA256 52a8f64722c0903591ebf6c51cc4b9336af1049124ca08d4a92f367593d8f79c MISC metadata.xml 252 RMD160 e1e9d40a05f958564b97dce796d3575508fb3b2e SHA1 f0acfb091052a67f482b06271d0ff89796dded07 SHA256 0db1ac5dbd8480024e1398a144440c9f0b77d5edf03789905ed31ae1d284aaf2 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkgzIycACgkQwnQyISwouHyRiACff6iu1ZZVOoYyfR7MBFM8fcGJ +YhgAni015uXzTJi0qo+/0+kNkMEQQid0 +=zbmZ +-----END PGP SIGNATURE----- diff --git a/x11-wm/sawfish/files/sawfish-1.3-shading.patch b/x11-wm/sawfish/files/sawfish-1.3-shading.patch deleted file mode 100644 index 43ac247f7903..000000000000 --- a/x11-wm/sawfish/files/sawfish-1.3-shading.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -r -u -x '*.jlc' -x .cvsignore sawfish-1.3_orig/lisp/sawfish/wm/frames.jl sawfish-1.3/lisp/sawfish/wm/frames.jl ---- sawfish-1.3_orig/lisp/sawfish/wm/frames.jl 2002-10-20 01:07:50.000000000 -0700 -+++ sawfish-1.3/lisp/sawfish/wm/frames.jl 2003-10-20 12:46:41.000000000 -0700 -@@ -155,8 +155,11 @@ - (icon . shaped-transient) - (dock . icon) - (utility . transient) -+ (shaded-utility . shaded-transient) - (toolbar . utility) -+ (shaded-toolbar . shaded-utility) - (menu . utility) -+ (shaded-menu . shaded-utility) - (splash . unframed)) - "Frame type fallbacks.") - -diff -r -u -x '*.jlc' -x .cvsignore sawfish-1.3_orig/lisp/sawfish/wm/state/shading.jl sawfish-1.3/lisp/sawfish/wm/state/shading.jl ---- sawfish-1.3_orig/lisp/sawfish/wm/state/shading.jl 2003-10-20 04:27:06.000000000 -0700 -+++ sawfish-1.3/lisp/sawfish/wm/state/shading.jl 2003-10-20 04:26:28.000000000 -0700 -@@ -83,6 +83,9 @@ - (case type - ((default shaped) 'shaded) - ((transient shaped-transient) 'shaded-transient) -+ ((utility shaped-utility) 'shaded-utility) -+ ((menu shaped-menu) 'shaded-menu) -+ ((toolbar shaped-toolbar) 'shaded-toolbar) - (t type)) - type)) - diff --git a/x11-wm/sawfish/files/sawfish-1.3-state-below.patch b/x11-wm/sawfish/files/sawfish-1.3-state-below.patch deleted file mode 100644 index 77bfabcaf523..000000000000 --- a/x11-wm/sawfish/files/sawfish-1.3-state-below.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl 2003-11-16 16:13:33.000000000 +0100 -+++ sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl 2003-03-16 21:56:48.000000000 +0100 -@@ -125,7 +125,7 @@ - _NET_WM_WINDOW_TYPE_UTILITY - _NET_WM_WINDOW_TYPE_SPLASH]) - -- (defvar wm-spec-below-depth +2) -+ (defvar wm-spec-below-depth -2) - (defvar wm-spec-above-depth +2) - - (define supported-states '()) diff --git a/x11-wm/sawfish/files/sawfish-configure-warning.patch b/x11-wm/sawfish/files/sawfish-configure-warning.patch deleted file mode 100644 index 2f3c55c3c080..000000000000 --- a/x11-wm/sawfish/files/sawfish-configure-warning.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 deleted file mode 100644 index 5e3e2125a4b0..000000000000 --- a/x11-wm/sawfish/files/sawfish-kde-menus.patch +++ /dev/null @@ -1,22 +0,0 @@ -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/files/sawfish-xft-menu-utf8.patch b/x11-wm/sawfish/files/sawfish-xft-menu-utf8.patch deleted file mode 100644 index b7afb0d13f18..000000000000 --- a/x11-wm/sawfish/files/sawfish-xft-menu-utf8.patch +++ /dev/null @@ -1,243 +0,0 @@ ---- config.h.in 2006-02-05 21:42:27.000000000 -0500 -+++ config.h.in 2006-02-05 21:48:46.000000000 -0500 -@@ -151,4 +151,7 @@ - #undef HAVE_PANGO_X - #undef HAVE_PANGO_XFT - -+/* Define if you have glib */ -+#undef HAVE_GLIB -+ - #endif /* SAWMILL_CONFIG_H */ ---- configure.in 2006-02-05 21:42:27.000000000 -0500 -+++ configure.in 2006-02-05 21:48:46.000000000 -0500 -@@ -127,7 +127,14 @@ - - CPPFLAGS="${_cppflags}" - --dnl Checks for pango -+dnl Checks for pango. Disabled by default -+ -+AC_ARG_WITH(pango, -+ [ --with-pango Enable pango font rendering engine -+ --without-pango], [], -+ [with_pango=no]) -+ -+if test "${with_pango}" = "yes"; then - PKG_CHECK_MODULES(PANGO, pango >= 1.2.0, - [if $PKG_CONFIG --exists pangoxft; then - AC_DEFINE(HAVE_PANGO_XFT, 1) -@@ -142,6 +149,7 @@ - PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_MODULES` - PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_MODULES` - fi], [: nothing]) -+fi - - dnl Check for librep - AM_PATH_REP(0.14) -@@ -247,6 +255,17 @@ - AC_DEFINE(HAVE_ESD) - fi - -+AC_ARG_WITH(glib, -+ [ --with-glib Use glib for locale -> utf8 -+ --without-glib], [], [with_glib=yes]) -+ -+if test "$with_glib" = "yes"; then -+ PKG_CHECK_MODULES(GLIB, glib-2.0 > 2.0) -+ AC_SUBST(GLIB_LIBS) -+ AC_SUBST(GLIB_CFLAGS) -+ AC_DEFINE(HAVE_GLIB) -+fi -+ - AC_ARG_ENABLE(capplet, - [ --enable-capplet Build the sawfish GNOME capplet [default] - --disable-capplet Don't built the capplet], [], ---- lisp/sawfish/wm/ext/beos-window-menu.jl 2006-02-05 21:42:27.000000000 -0500 -+++ lisp/sawfish/wm/ext/beos-window-menu.jl 2006-02-05 21:49:07.000000000 -0500 -@@ -25,6 +25,7 @@ - (export beos-window-menu) - - (open rep -+ rep.regexp - sawfish.wm.windows - sawfish.wm.misc - sawfish.wm.custom -@@ -38,9 +39,16 @@ - - (define (abbreviate name #!optional len) - (unless len (setq len 20)) -- (if (> (length name) len) -- (concat (substring name 0 len) "...") -- name)) -+ (setq name (locale-to-utf8 name)) -+ (let ((namelen (length name))) -+ (let loop ((idx len)) -+ (cond ((>= idx namelen) -+ name) -+ ((string-match "[\200-\277]" (substring name idx (1+ idx))) -+ ;; move to utf-8 mbchar boundary -+ (loop (1+ idx))) -+ (t -+ (concat (substring name 0 idx) "...")))))) - - (define (make-label w) - (let ((name (window-name w)) ---- src/fonts.c 2006-02-05 21:42:27.000000000 -0500 -+++ src/fonts.c 2006-02-05 21:49:22.000000000 -0500 -@@ -42,14 +42,18 @@ - #include <X11/Xlocale.h> - #include <ctype.h> - -+#ifdef HAVE_GLIB -+# include<glib.h> -+#endif -+ - #ifdef HAVE_X11_XFT_XFT_H - # include <X11/Xft/Xft.h> - #else - # undef HAVE_PANGO - #endif - -+ - #ifdef HAVE_PANGO --# include <glib.h> - # define PANGO_ENABLE_BACKEND - # include <pango/pango.h> - # undef PANGO_ENABLE_BACKEND -@@ -364,9 +368,22 @@ - xft_measure (Lisp_Font *f, u_char *string, size_t length) - { - XGlyphInfo info; -- -- XftTextExtents8 (dpy, f->font, string, length, &info); -- -+#ifdef HAVE_GLIB -+ gsize r, w; -+ u_char *utf8str; -+ utf8str = g_locale_to_utf8 (string, length, &r, &w, NULL); -+ if (utf8str != NULL){ -+ string = utf8str; -+ length = w; -+ } -+ -+ XftTextExtentsUtf8 (dpy, f->font, string, length, &info); -+ -+ g_free(utf8str); -+#else -+ XftTextExtents8 (dpy, f->font, string, length, &info); -+#endif -+ - return info.xOff; - } - -@@ -375,6 +392,10 @@ - Window id, GC gc, Lisp_Color *fg, int x, int y) - { - static XftDraw *draw; -+#ifdef HAVE_GLIB -+ gsize r, w; -+ u_char *utf8str; -+#endif - - XftColor xft_color; - -@@ -389,8 +410,21 @@ - xft_color.color.blue = fg->blue; - xft_color.color.alpha = fg->alpha; - -+#ifdef HAVE_GLIB -+ utf8str = g_locale_to_utf8 (string, length, &r, &w, NULL); -+ if (utf8str != NULL){ -+ string = utf8str; -+ length = w; -+ } -+ -+ XftDrawStringUtf8 (draw, &xft_color, f->font, -+ x, y, string, length); -+ g_free(utf8str); -+#else - XftDrawString8 (draw, &xft_color, f->font, - x, y, string, length); -+#endif -+ - } - - static const Lisp_Font_Class xft_class = { ---- src/functions.c 2006-02-05 21:42:27.000000000 -0500 -+++ src/functions.c 2006-02-05 21:49:27.000000000 -0500 -@@ -43,7 +43,9 @@ - #include "sawmill.h" - #include <string.h> - #include <X11/Xatom.h> -- -+#ifdef HAVE_GLIB -+#include <glib.h> -+#endif - /* Number of outstanding server grabs made; only when this is zero is - the server ungrabbed. */ - static int server_grabs; -@@ -1340,6 +1342,37 @@ - } - } - -+DEFUN("locale-to-utf8", Flocale_to_utf8, Slocale_to_utf8, -+ (repv src), rep_Subr1) -+{ -+#ifdef HAVE_GLIB -+ gsize r, w; -+ u_char *utf8str; -+ repv res; -+ -+ rep_DECLARE1 (src, rep_STRINGP); -+ -+ utf8str = g_locale_to_utf8 (rep_STR (src), -1, &r, &w, NULL); -+ if (utf8str == NULL) { -+ return src; -+ } -+ -+ res = rep_make_string (w + 1); -+ if (!res) -+ return rep_mem_error (); -+ -+ strncpy (rep_STR (res), utf8str, w); -+ rep_STR (res)[w] = '\0'; -+ -+ g_free (utf8str); -+ return res; -+#else -+ return src; -+#endif -+} -+ -+ -+ - - /* initialisation */ - -@@ -1380,6 +1413,7 @@ - rep_ADD_SUBR(Shead_dimensions); - rep_ADD_SUBR(Shead_offset); - rep_ADD_SUBR(Sdisplay_message); -+ rep_ADD_SUBR(Slocale_to_utf8); - rep_pop_structure (tem); - - tem = rep_push_structure ("sawfish.wm.events"); ---- src/Makefile.in 2006-02-05 21:42:27.000000000 -0500 -+++ src/Makefile.in 2006-02-05 21:53:35.000000000 -0500 -@@ -38,14 +38,14 @@ - sawfish/wm/util/play-sample.la - DL_DIRS = sawfish/wm/util - --override CFLAGS := $(CFLAGS) $(REP_CFLAGS) $(IMAGE_CFLAGS) $(X11_CFLAGS) $(ESD_CFLAGS) $(PANGO_CFLAGS) -+override CFLAGS := $(CFLAGS) $(REP_CFLAGS) $(IMAGE_CFLAGS) $(X11_CFLAGS) $(ESD_CFLAGS) $(PANGO_CFLAGS) $(GLIB_CFLAGS) - - all : sawfish libclient.o $(DL_OBJS) .libexec gtk-style - - sawfish : $(OBJS) $(LIBOBJS) - $(rep_LIBTOOL) --mode=link --tag=CC $(CC) -export-dynamic $(LDFLAGS) \ - -o sawfish $(OBJS) $(LIBOBJS) $(REP_LIBS) $(PANGO_LIBS) \ -- $(IMAGE_LIBS) $(X11_LIBS) $(EXTRA_X11_LIBS) $(LIBS) -+ $(IMAGE_LIBS) $(X11_LIBS) $(EXTRA_X11_LIBS) $(LIBS) $(GLIB_LIBS) - - %.la : %.lo - $(rep_DL_LD) $(LDFLAGS) -o $@ $< diff --git a/x11-wm/sawfish/sawfish-1.3_p20050816-r1.ebuild b/x11-wm/sawfish/sawfish-1.3_p20050816-r1.ebuild deleted file mode 100644 index 8a9859b47525..000000000000 --- a/x11-wm/sawfish/sawfish-1.3_p20050816-r1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3_p20050816-r1.ebuild,v 1.1 2008/01/22 20:58:35 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 = !$? )) - -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/_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 utf8 with xft #121772 - epatch "${FILESDIR}/sawfish-xft-menu-utf8.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 -} diff --git a/x11-wm/sawfish/sawfish-1.3_p20060816.ebuild b/x11-wm/sawfish/sawfish-1.3_p20060816.ebuild deleted file mode 100644 index b245ceff2eb1..000000000000 --- a/x11-wm/sawfish/sawfish-1.3_p20060816.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3_p20060816.ebuild,v 1.2 2008/01/23 06:06:52 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://sawmill.sourceforge.net/" -if (( snapshot )); then - SRC_URI="mirror://gentoo/${P/_p/.}.tar.bz2" -else - SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha ~amd64 ia64 ppc ~ppc64 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 - 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 - - 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 -- \ - --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 -} |