From 7fcea0ee59ed44af1e63fb94fcfba871db706c66 Mon Sep 17 00:00:00 2001 From: Harald van Dijk Date: Tue, 16 Aug 2005 15:33:06 +0000 Subject: remove unused patches, partially correct dependencies (Portage version: 2.0.51.22-r2) --- x11-wm/sawfish/ChangeLog | 10 +++++++- x11-wm/sawfish/Manifest | 30 +++++++---------------- x11-wm/sawfish/files/sawfish-1.2-fullscreen.patch | 12 --------- x11-wm/sawfish/files/sawfish-1.2-gtk+-2.2.patch | 11 --------- x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild | 10 +++----- 5 files changed, 22 insertions(+), 51 deletions(-) delete mode 100644 x11-wm/sawfish/files/sawfish-1.2-fullscreen.patch delete mode 100644 x11-wm/sawfish/files/sawfish-1.2-gtk+-2.2.patch (limited to 'x11-wm') diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog index 856cd8b78311..f085a96c538c 100644 --- a/x11-wm/sawfish/ChangeLog +++ b/x11-wm/sawfish/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-wm/sawfish # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.52 2005/06/23 13:14:46 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.53 2005/08/16 15:33:06 truedfx Exp $ + + 16 Aug 2005; Harald van Dijk + -files/sawfish-1.2-fullscreen.patch, -files/sawfish-1.2-gtk+-2.2.patch, + sawfish-1.3.20040120-r1.ebuild: + removed sawfish 1.2 patches + partially fixed dependencies for 1.3.20040120-r1 (readline isn't used + anymore, esound version was a bit too low, and added an audiofile minimal + version) 23 Jun 2005; Aron Griffis +sawfish-1.0.1-r6.ebuild, -sawfish-1.2.ebuild: diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest index 882062586276..44dca079c66a 100644 --- a/x11-wm/sawfish/Manifest +++ b/x11-wm/sawfish/Manifest @@ -1,25 +1,13 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 2dfef4a3fc9332df431ea0b2b06c5ee8 sawfish-1.3.20040120.ebuild 2700 -MD5 eb5d859670c6ea8a0904662860c180b0 sawfish-1.0.1-r6.ebuild 2017 -MD5 d867afc4d147fd720bf9339531e21fe3 ChangeLog 8422 +MD5 96820fc351050feb331d406f864fe4ac ChangeLog 8772 MD5 87cb07e2d3612bc798e3722f4f882671 metadata.xml 250 -MD5 e6493e3574c0b7c882ace118216ae64a sawfish-1.3.20040120-r1.ebuild 2633 -MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120 74 +MD5 eb5d859670c6ea8a0904662860c180b0 sawfish-1.0.1-r6.ebuild 2017 +MD5 937394875639a2ab5331610099daa3ab sawfish-1.3.20040120-r1.ebuild 2568 +MD5 2dfef4a3fc9332df431ea0b2b06c5ee8 sawfish-1.3.20040120.ebuild 2700 MD5 caeb1eaaf77305901f5c3bc19f3637d5 files/Sawfish.desktop 449 -MD5 cd8e05ea2ee9e1ff63339dd0b0f021f6 files/sawfish-1.0.1-exec.patch 451 -MD5 88c0f86adbddc2cf06588742162c5480 files/sawfish-1.2-gtk+-2.2.patch 471 -MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120-r1 74 MD5 1ae747636b3422e00ef41cc07fc37ab4 files/capplet-crash.patch 556 -MD5 280d364bfd0878351ebbbcbc62ac19c4 files/sawfish-1.3-state-below.patch 403 -MD5 1e1b4b3609f8e62666856d07e393068f files/sawfish-1.3-shading.patch 1198 MD5 a7d051180bc14a630027439f0d385dcd files/digest-sawfish-1.0.1-r6 66 -MD5 479a0928dfaab241c12c7dbf7d06cb4f files/sawfish-1.2-fullscreen.patch 459 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCurXZBXaUFmZvwyMRAl8mAKC/rWsbHWyFgic+bp2x+g5qtN+E9gCfZ9l2 -ycUP5fQNeGwPeAkbfvSobis= -=0Fph ------END PGP SIGNATURE----- +MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120-r1 74 +MD5 cd8e05ea2ee9e1ff63339dd0b0f021f6 files/sawfish-1.0.1-exec.patch 451 +MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120 74 +MD5 1e1b4b3609f8e62666856d07e393068f files/sawfish-1.3-shading.patch 1198 +MD5 280d364bfd0878351ebbbcbc62ac19c4 files/sawfish-1.3-state-below.patch 403 diff --git a/x11-wm/sawfish/files/sawfish-1.2-fullscreen.patch b/x11-wm/sawfish/files/sawfish-1.2-fullscreen.patch deleted file mode 100644 index aa7482528dd0..000000000000 --- a/x11-wm/sawfish/files/sawfish-1.2-fullscreen.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- lisp/sawfish/wm/windows.jl.old 2002-11-18 15:58:07.000000000 +0100 -+++ lisp/sawfish/wm/windows.jl 2002-11-18 15:58:39.000000000 +0100 -@@ -320,7 +320,7 @@ - (t x)))) - - (define (adjust-position-for-gravity/y w grav y #!key inverse) -- (let* ((tl-off (window-frame-offset w)) -+ (let* ((tl-off (cdr (window-frame-offset w))) - (br-off (- (cdr (window-frame-dimensions w)) - (cdr (window-dimensions w)))) - (sign (if inverse -1 +1))) - diff --git a/x11-wm/sawfish/files/sawfish-1.2-gtk+-2.2.patch b/x11-wm/sawfish/files/sawfish-1.2-gtk+-2.2.patch deleted file mode 100644 index d5215adc74c9..000000000000 --- a/x11-wm/sawfish/files/sawfish-1.2-gtk+-2.2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sawfish-1.2-gtk2/src/gtk-style.c.orig 2002-01-10 14:29:21.000000000 -0500 -+++ sawfish-1.2-gtk2/src/gtk-style.c 2003-01-04 23:16:31.000000000 -0500 -@@ -97,7 +97,7 @@ - { - /* If GTK_MINOR_VERSION is not 2 we are using gtk+ 1.3.x or 2.0 - so these two members are no more */ --#if (GTK_MINOR_VERSION == 2) -+#if (GTK_MAJOR_VERSION == 1 && GTK_MINOR_VERSION == 2) - if (rc->font_name != 0) - printf ("(font . \"%s\")\n", rc->font_name); - if (rc->fontset_name != 0) diff --git a/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild b/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild index a86e15e75534..a6e614e46abb 100644 --- a/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild +++ b/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild,v 1.1 2005/06/23 02:06:44 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild,v 1.2 2005/08/16 15:33:06 truedfx Exp $ inherit eutils gnuconfig -IUSE="gnome readline esd nls audiofile" +IUSE="gnome esd nls audiofile" # detect cvs snapshots; fex. 1.3.20040120 if [[ $PV == *.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] ]]; then @@ -30,9 +30,8 @@ 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 ) - esd? ( >=media-sound/esound-0.2.22 ) - readline? ( >=sys-libs/readline-4.1 ) + audiofile? ( >=media-libs/audiofile-0.2.3 ) + esd? ( >=media-sound/esound-0.2.23 ) nls? ( sys-devel/gettext )" # cvs snapshots require automake/autoconf @@ -74,7 +73,6 @@ src_compile() { $(useq nls || echo --disable-linguas) \ $(use_with audiofile) \ $(use_with esd) \ - $(use_with readline) \ ${myconf} || die # The following two lines allow sawfish to compile with gcc 2.95 -- cgit v1.2.3-65-gdbad