diff options
Diffstat (limited to 'x11-wm')
14 files changed, 73 insertions, 250 deletions
diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog index 9b5b011129d6..002d36479733 100644 --- a/x11-wm/sawfish/ChangeLog +++ b/x11-wm/sawfish/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for x11-wm/sawfish -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.79 2007/11/07 19:55:28 armin76 Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.80 2008/01/22 20:58:35 truedfx Exp $ + +*sawfish-1.3.2 (22 Jan 2008) +*sawfish-1.3_p20060816 (22 Jan 2008) +*sawfish-1.3_p20050816-r1 (22 Jan 2008) + + 22 Jan 2008; Harald van Dijk <truedfx@gentoo.org> -files/Sawfish.desktop, + +files/sawfish-wm_name.patch, +sawfish-1.3_p20050816-r1.ebuild, + +sawfish-1.3_p20060816.ebuild, +sawfish-1.3.2.ebuild, + -sawfish-1.3.20040120.ebuild, -sawfish-1.3.20040120-r1.ebuild, + -sawfish-1.3.20050816.ebuild, -sawfish-1.3.20050816-r1.ebuild, + -sawfish-1.3.20060816.ebuild: + Rename older ebuilds so that they don't show up as higher than 1.3.2, and + add 1.3.2 07 Nov 2007; Raúl Porcel <armin76@gentoo.org> sawfish-1.3.20060816.ebuild: diff --git a/x11-wm/sawfish/files/Sawfish.desktop b/x11-wm/sawfish/files/Sawfish.desktop deleted file mode 100644 index 446d3c0b6579..000000000000 --- a/x11-wm/sawfish/files/Sawfish.desktop +++ /dev/null @@ -1,27 +0,0 @@ -[Desktop Entry] -Name=Sawfish -Name[da]=Sawfish -Name[de]=Sawfish -Name[es]=Sawfish -Name[fi]=Sawfish -Name[fr]=Sawfish -Name[gl]=Sawfish -Name[hu]=Sawfish -Name[ja]=Sawfish -Name[ko]=Sawfish -Name[no]=Sawfish -Name[pl]=Sawfish -Name[ru]=Sawfish -Name[sk]=Sawfish -Name[sl]=Sawfish -Name[sv]=Sawfish -Name[uk]=Sawfish -Name[wa]=Sawfish -NAme[tr]=Sawfish -Exec=sawfish -TryExec=sawfish - -[Window Manager] -ConfigExec=sawfish-ui -ConfigTryExec=sawfish-ui -SessionManaged=true diff --git a/x11-wm/sawfish/files/digest-sawfish-1.3.2 b/x11-wm/sawfish/files/digest-sawfish-1.3.2 new file mode 100644 index 000000000000..a081c1b836a0 --- /dev/null +++ b/x11-wm/sawfish/files/digest-sawfish-1.3.2 @@ -0,0 +1,3 @@ +MD5 b068bb0f0c4326bbac0981837f6d293e sawfish-1.3.2.tar.gz 1950794 +RMD160 3dc71d5744e6df04cba8cb9c1387b67708ad5122 sawfish-1.3.2.tar.gz 1950794 +SHA256 2d614fdf62da8f70b52b8025789f236adca29ad6c8ee791c1d60747f1e1a4309 sawfish-1.3.2.tar.gz 1950794 diff --git a/x11-wm/sawfish/files/digest-sawfish-1.3.20040120 b/x11-wm/sawfish/files/digest-sawfish-1.3.20040120 deleted file mode 100644 index 2801495532cf..000000000000 --- a/x11-wm/sawfish/files/digest-sawfish-1.3.20040120 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6a5318d0e6372b66fe15af2235d65e7d sawfish-1.3.20040120.tar.bz2 1108560 -RMD160 c95594d08f56ce72d847b54240b32a2c8bc5b77d sawfish-1.3.20040120.tar.bz2 1108560 -SHA256 883d393bb813a642141d926487502b67cba47771b8d8c0b15333bb6eb7dad679 sawfish-1.3.20040120.tar.bz2 1108560 diff --git a/x11-wm/sawfish/files/digest-sawfish-1.3.20040120-r1 b/x11-wm/sawfish/files/digest-sawfish-1.3.20040120-r1 deleted file mode 100644 index 2801495532cf..000000000000 --- a/x11-wm/sawfish/files/digest-sawfish-1.3.20040120-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6a5318d0e6372b66fe15af2235d65e7d sawfish-1.3.20040120.tar.bz2 1108560 -RMD160 c95594d08f56ce72d847b54240b32a2c8bc5b77d sawfish-1.3.20040120.tar.bz2 1108560 -SHA256 883d393bb813a642141d926487502b67cba47771b8d8c0b15333bb6eb7dad679 sawfish-1.3.20040120.tar.bz2 1108560 diff --git a/x11-wm/sawfish/files/digest-sawfish-1.3.20050816-r1 b/x11-wm/sawfish/files/digest-sawfish-1.3.20050816-r1 deleted file mode 100644 index ace9f6842fec..000000000000 --- a/x11-wm/sawfish/files/digest-sawfish-1.3.20050816-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ce418e61e0388e9ab45b06cd68a966df sawfish-1.3.20050816.tar.bz2 1145082 -RMD160 e15e222baa1f1f52f085f4658abc3d8a37d6c8e8 sawfish-1.3.20050816.tar.bz2 1145082 -SHA256 2b4954f1605e985dba5d71fafd57c4d2914bd7e0b19941c3b937915772fc98f3 sawfish-1.3.20050816.tar.bz2 1145082 diff --git a/x11-wm/sawfish/files/digest-sawfish-1.3.20050816 b/x11-wm/sawfish/files/digest-sawfish-1.3_p20050816-r1 index ace9f6842fec..ace9f6842fec 100644 --- a/x11-wm/sawfish/files/digest-sawfish-1.3.20050816 +++ b/x11-wm/sawfish/files/digest-sawfish-1.3_p20050816-r1 diff --git a/x11-wm/sawfish/files/digest-sawfish-1.3.20060816 b/x11-wm/sawfish/files/digest-sawfish-1.3_p20060816 index 99ef81836870..99ef81836870 100644 --- a/x11-wm/sawfish/files/digest-sawfish-1.3.20060816 +++ b/x11-wm/sawfish/files/digest-sawfish-1.3_p20060816 diff --git a/x11-wm/sawfish/files/sawfish-wm_name.patch b/x11-wm/sawfish/files/sawfish-wm_name.patch new file mode 100644 index 000000000000..e14ad4943625 --- /dev/null +++ b/x11-wm/sawfish/files/sawfish-wm_name.patch @@ -0,0 +1,16 @@ +# http://mail.gnome.org/archives/sawfish-list/2008-January/msg00064.html + +--- sawfish-1.3.2/src/events.c ++++ sawfish-1.3.2/src/events.c +@@ -550,11 +550,6 @@ + } + } + +- /* No point in updating the rest if we have the _NET ones. They won't +- be used anyways. */ +- if (w->net_name != Qnil) +- return FALSE; +- + if (xproperty.atom == XA_WM_NAME) + { + if (str == Qnil) diff --git a/x11-wm/sawfish/sawfish-1.3.20050816.ebuild b/x11-wm/sawfish/sawfish-1.3.2.ebuild index ea6e242ff9c3..5d8ba8bd8d8a 100644 --- a/x11-wm/sawfish/sawfish-1.3.20050816.ebuild +++ b/x11-wm/sawfish/sawfish-1.3.2.ebuild @@ -1,12 +1,18 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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.20050816.ebuild,v 1.8 2006/06/15 20:32:59 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.2.ebuild,v 1.1 2008/01/22 20:58:35 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] ]] +# 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 +if (( snapshot )); then + WANT_AUTOCONF=latest + WANT_AUTOMAKE=latest + inherit eutils autotools +else + inherit eutils +fi DESCRIPTION="Extensible window manager using a Lisp-based scripting language" HOMEPAGE="http://sawmill.sourceforge.net/" @@ -18,8 +24,10 @@ fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha ~amd64 ia64 ~ppc ~sparc ~x86" -IUSE="gnome esd nls audiofile" +# Will remain masked until a report of a segfault on the mailing list +# is resolved +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 @@ -31,16 +39,19 @@ DEPEND=">=dev-util/pkgconfig-0.12.0 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" + epatch "${FILESDIR}"/libtool.patch + epatch "${FILESDIR}"/${PN}-wm_name.patch + + if (( snapshot )); then + eaclocal || die + eautoconf || die + fi } src_compile() { @@ -49,17 +60,12 @@ src_compile() { 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 esd) \ + $(use_with pango) if use gnome; then set -- "$@" \ @@ -91,11 +97,13 @@ src_compile() { # (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" + # Parallel build didn't work, but appears to work now. This needs + # extra checking before this version is unmasked. + emake || die "make failed" } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "make install failed" dodoc AUTHORS BUGS ChangeLog DOC FAQ NEWS README THANKS TODO OPTIONS + newdoc src/ChangeLog ChangeLog.src } diff --git a/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild b/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild deleted file mode 100644 index c5a075266061..000000000000 --- a/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# 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.20040120-r1.ebuild,v 1.6 2006/06/15 20:32:59 truedfx Exp $ - -inherit eutils - -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 - sawfishsnapshot=true -else - sawfishsnapshot=false -fi - -DESCRIPTION="Extensible window manager using a Lisp-based scripting language" -HOMEPAGE="http://sawmill.sourceforge.net/" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="alpha amd64 ia64 ppc sparc x86" -if $sawfishsnapshot; then - SRC_URI="mirror://gentoo/${P}.tar.bz2" - S=${WORKDIR}/${PN} -else - SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz" - S=${WORKDIR}/${P} -fi - -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 )" - -# cvs snapshots require automake/autoconf -if $sawfishsnapshot; then - DEPEND="${DEPEND} sys-devel/automake sys-devel/autoconf" -fi - -src_compile() { - local myconf - - # 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 $sawfishsnapshot; then - aclocal || die "aclocal failed" - autoconf || die "autoconf failed" - fi - - if use gnome; then - myconf="--with-gnome-prefix=/usr \ - --enable-gnome-widgets --enable-capplet" - else - myconf="--disable-gnome-widgets --disable-capplet" - fi - - econf \ - --enable-themer \ - --with-gdk-pixbuf \ - $(useq nls || echo --disable-linguas) \ - $(use_with audiofile) \ - $(use_with esd) \ - ${myconf} || die - - # 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 -} - -src_install() { - make DESTDIR=${D} install || die - dodoc AUTHORS BUGS COPYING ChangeLog DOC FAQ NEWS README THANKS TODO OPTIONS - - # Add to Gnome CC's Window Manager list - if use gnome; then - insinto /usr/share/gnome/wm-properties - doins ${S}/Sawfish.desktop - fi -} diff --git a/x11-wm/sawfish/sawfish-1.3.20040120.ebuild b/x11-wm/sawfish/sawfish-1.3.20040120.ebuild deleted file mode 100644 index 7f842f4d46c6..000000000000 --- a/x11-wm/sawfish/sawfish-1.3.20040120.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# 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.20040120.ebuild,v 1.10 2006/06/15 20:32:59 truedfx Exp $ - -inherit eutils - -IUSE="gnome readline esd nls" - -# 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 - sawfishsnapshot=true -else - sawfishsnapshot=false -fi - -DESCRIPTION="Extensible window manager using a Lisp-based scripting language" -HOMEPAGE="http://sawmill.sourceforge.net/" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 alpha ia64 amd64 sparc ppc" -if $sawfishsnapshot; then - SRC_URI="mirror://gentoo/${P}.tar.bz2" - S=${WORKDIR}/${PN} -else - SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz" - S=${WORKDIR}/${P} -fi - -DEPEND=">=dev-util/pkgconfig-0.12.0 - >=x11-libs/rep-gtk-0.17 - >=dev-libs/librep-0.16 - >=media-libs/imlib-1.9.10-r1 - media-libs/audiofile - >=x11-libs/gtk+-2.0.8 - esd? ( >=media-sound/esound-0.2.22 ) - readline? ( >=sys-libs/readline-4.1 ) - nls? ( sys-devel/gettext ) - >=sys-apps/sed-4" - -# cvs snapshots require automake/autoconf -if $sawfishsnapshot; then - DEPEND="${DEPEND} sys-devel/automake sys-devel/autoconf" -fi - -src_compile() { - local myconf - - myconf="${myconf} `use_with esd`" - myconf="${myconf} `use_with readline`" - use nls || myconf="${myconf} --disable-linguas" - - if use gnome; then - myconf="${myconf} --with-gnome-prefix=/usr \ - --enable-gnome-widgets --enable-capplet" - else - myconf="${myconf} --disable-gnome-widgets --disable-capplet" - fi - - # 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 $sawfishsnapshot; then - aclocal || die "aclocal failed" - autoconf || die "autoconf failed" - fi - - econf \ - --enable-themer \ - --with-gdk-pixbuf \ - --with-audiofile \ - ${myconf} || die - - # 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 -} - -src_install() { - make DESTDIR=${D} install || die - dodoc AUTHORS BUGS COPYING ChangeLog DOC FAQ NEWS README THANKS TODO OPTIONS - - # Add to Gnome CC's Window Manager list - if use gnome; then - insinto /usr/share/gnome/wm-properties - doins ${S}/Sawfish.desktop - fi -} diff --git a/x11-wm/sawfish/sawfish-1.3.20050816-r1.ebuild b/x11-wm/sawfish/sawfish-1.3_p20050816-r1.ebuild index 7defccd567d1..8a9859b47525 100644 --- a/x11-wm/sawfish/sawfish-1.3.20050816-r1.ebuild +++ b/x11-wm/sawfish/sawfish-1.3_p20050816-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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.20050816-r1.ebuild,v 1.8 2006/11/13 23:00:34 kloeri Exp $ +# $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.20040120 -[[ $PV == *.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] ]] +# 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 @@ -11,7 +11,7 @@ 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" + SRC_URI="mirror://gentoo/${P/_p/.}.tar.bz2" else SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz" fi diff --git a/x11-wm/sawfish/sawfish-1.3.20060816.ebuild b/x11-wm/sawfish/sawfish-1.3_p20060816.ebuild index 05eb9dc57442..143e23c01476 100644 --- a/x11-wm/sawfish/sawfish-1.3.20060816.ebuild +++ b/x11-wm/sawfish/sawfish-1.3_p20060816.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2007 Gentoo Foundation +# 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.20060816.ebuild,v 1.6 2007/11/07 19:55:28 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3_p20060816.ebuild,v 1.1 2008/01/22 20:58:35 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] ]] +# 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 @@ -17,7 +17,7 @@ fi 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" + SRC_URI="mirror://gentoo/${P/_p/.}.tar.bz2" else SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz" fi |