From cdc8a18e2a6cfc9ee7abb9e1a7b2c060cafdc4eb Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sun, 27 Mar 2011 13:06:12 +0000 Subject: Fix slot-deps on gnome libs, remove old Package-Manager: portage-2.1.9.44/cvs/Linux x86_64 --- x11-wm/metacity/ChangeLog | 6 ++- x11-wm/metacity/metacity-2.30.1.ebuild | 88 --------------------------------- x11-wm/metacity/metacity-2.30.3.ebuild | 6 +-- x11-wm/sawfish/ChangeLog | 9 +++- x11-wm/sawfish/sawfish-1.3.5.2.ebuild | 90 ---------------------------------- x11-wm/sawfish/sawfish-1.5.3.ebuild | 78 ----------------------------- x11-wm/sawfish/sawfish-1.6.2.ebuild | 76 ---------------------------- x11-wm/sawfish/sawfish-1.6.3.ebuild | 8 +-- 8 files changed, 20 insertions(+), 341 deletions(-) delete mode 100644 x11-wm/metacity/metacity-2.30.1.ebuild delete mode 100644 x11-wm/sawfish/sawfish-1.3.5.2.ebuild delete mode 100644 x11-wm/sawfish/sawfish-1.5.3.ebuild delete mode 100644 x11-wm/sawfish/sawfish-1.6.2.ebuild (limited to 'x11-wm') diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog index 5909ccca7540..57a2cf553adc 100644 --- a/x11-wm/metacity/ChangeLog +++ b/x11-wm/metacity/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/metacity # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.268 2011/03/22 19:55:12 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.269 2011/03/27 13:04:59 nirbheek Exp $ + + 27 Mar 2011; Nirbheek Chauhan + -metacity-2.30.1.ebuild, metacity-2.30.3.ebuild: + Fix slot-deps on gnome libs, remove old 22 Mar 2011; Brent Baude metacity-2.30.3.ebuild: Marking metacity-2.30.3 ppc stable for bug 353436 diff --git a/x11-wm/metacity/metacity-2.30.1.ebuild b/x11-wm/metacity/metacity-2.30.1.ebuild deleted file mode 100644 index ec6dedb361bc..000000000000 --- a/x11-wm/metacity/metacity-2.30.1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.30.1.ebuild,v 1.8 2010/10/17 15:12:41 armin76 Exp $ - -EAPI="2" -# debug only changes CFLAGS -GCONF_DEBUG="no" - -inherit eutils gnome2 - -DESCRIPTION="GNOME default window manager" -HOMEPAGE="http://blogs.gnome.org/metacity/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="test xinerama" - -# XXX: libgtop is automagic, hard-enabled instead -RDEPEND=">=x11-libs/gtk+-2.10 - >=x11-libs/pango-1.2[X] - >=gnome-base/gconf-2 - >=dev-libs/glib-2.6 - >=x11-libs/startup-notification-0.7 - >=x11-libs/libXcomposite-0.2 - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXdamage - x11-libs/libXcursor - x11-libs/libX11 - xinerama? ( x11-libs/libXinerama ) - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libSM - x11-libs/libICE - media-libs/libcanberra[gtk] - gnome-base/libgtop - gnome-extra/zenity - !x11-misc/expocity" -DEPEND="${RDEPEND} - >=app-text/gnome-doc-utils-0.8 - sys-devel/gettext - >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.35 - test? ( app-text/docbook-xml-dtd:4.5 ) - xinerama? ( x11-proto/xineramaproto ) - x11-proto/xextproto - x11-proto/xproto" - -DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt" - -pkg_setup() { - G2CONF="${G2CONF} - --enable-compositor - --enable-gconf - --enable-render - --enable-shape - --enable-sm - --enable-startup-notification - --enable-xsync - $(use_enable xinerama)" -} - -src_prepare() { - gnome2_src_prepare - - # Fix intltoolize broken file, see upstream #577133 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ - || die "sed failed" - - # Remove stupid CFLAGS, bug #259179 - sed "s:-Werror::g" -i configure.in configure || die "sed failed" - # Should set RestartStyleHint to RestartIfRunning when replaced, - # this fix a strange issue with gnome-session (100% of the CPU, - # and try to restart metacity infinitively when compiz is started) - # patch import from upstream bug #588119. - epatch "${FILESDIR}/${PN}-2.28.0-restartstylehint-when-replace.patch" - - # Use sys/wait.h header instead of wait.h as described in posix specs, - # bug 292009 - epatch "${FILESDIR}/${PN}-2.28.0-sys-wait-header.patch" - - # WIFEXITED and friends are defined in sys/wait.h - # Fixes a build failure on BSD. - # https://bugs.gentoo.org/show_bug.cgi?id=309443 - # https://bugzilla.gnome.org/show_bug.cgi?id=605460 - epatch "${FILESDIR}/${PN}-2.28.1-wif_macros.patch" -} diff --git a/x11-wm/metacity/metacity-2.30.3.ebuild b/x11-wm/metacity/metacity-2.30.3.ebuild index d70f41056426..f1cd93465f80 100644 --- a/x11-wm/metacity/metacity-2.30.3.ebuild +++ b/x11-wm/metacity/metacity-2.30.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.30.3.ebuild,v 1.6 2011/03/22 19:55:12 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.30.3.ebuild,v 1.7 2011/03/27 13:04:59 nirbheek Exp $ EAPI="3" # debug only changes CFLAGS @@ -19,8 +19,8 @@ IUSE="test xinerama" # XXX: libgtop is automagic, hard-enabled instead RDEPEND=">=x11-libs/gtk+-2.20:2 >=x11-libs/pango-1.2[X] - >=gnome-base/gconf-2 - >=dev-libs/glib-2.6 + >=gnome-base/gconf-2:2 + >=dev-libs/glib-2.6:2 >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 x11-libs/libXfixes diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog index ee1f846d54e2..b3c96c889590 100644 --- a/x11-wm/sawfish/ChangeLog +++ b/x11-wm/sawfish/ChangeLog @@ -1,6 +1,11 @@ # 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.94 2010/05/31 20:05:17 truedfx Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.95 2011/03/27 13:06:12 nirbheek Exp $ + + 27 Mar 2011; Nirbheek Chauhan + -sawfish-1.3.5.2.ebuild, -sawfish-1.5.3.ebuild, -sawfish-1.6.2.ebuild, + sawfish-1.6.3.ebuild: + Fix slot-deps on gnome libs, remove old *sawfish-1.6.3 (31 May 2010) diff --git a/x11-wm/sawfish/sawfish-1.3.5.2.ebuild b/x11-wm/sawfish/sawfish-1.3.5.2.ebuild deleted file mode 100644 index a13adca1d05b..000000000000 --- a/x11-wm/sawfish/sawfish-1.3.5.2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.5.2.ebuild,v 1.1 2009/03/08 20:06:33 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 = !$? )) - -# 1.3.5.2 was released with a broken config.h.in -#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.bz2" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="esd nls audiofile" - -RDEPEND=">=x11-libs/rep-gtk-0.18.4 - >=dev-libs/librep-0.17.3 - >=x11-libs/gtk+-2.0.8 - audiofile? ( >=media-libs/audiofile-0.2.3 ) - esd? ( >=media-sound/esound-0.2.23 ) - nls? ( sys-devel/gettext )" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12.0" - -if (( snapshot )); then - S="${WORKDIR}/${PN}" -fi - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-1.3.3-cflags.patch - epatch "${FILESDIR}"/${P}-pangoxft.patch - - #if (( snapshot )); then - eautoreconf - #fi -} - -src_compile() { - # Make sure we include freetype2 headers before freetype1 headers, - # else Xft2 borks, (13 Dec 2002) - export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2" - export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2" - - set -- \ - --with-gdk-pixbuf \ - $(use_with audiofile) \ - $(use_with esd) - - 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 - - emake || die "make failed" -} - -src_install() { - 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.5.3.ebuild b/x11-wm/sawfish/sawfish-1.5.3.ebuild deleted file mode 100644 index 4fba2aa6e28f..000000000000 --- a/x11-wm/sawfish/sawfish-1.5.3.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# 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.5.3.ebuild,v 1.2 2010/03/24 18:25:54 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.bz2" -fi - -LICENSE="GPL-2 Artistic-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="audiofile esd nls" - -RDEPEND=">=dev-libs/librep-0.90.0 - >=x11-libs/rep-gtk-0.90.0 - >=x11-libs/pango-1.8.0 - >=x11-libs/gtk+-2.6.0 - audiofile? ( >=media-libs/audiofile-0.2.3 ) - esd? ( >=media-sound/esound-0.2.23 ) - nls? ( sys-devel/gettext ) - x11-libs/libXinerama" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12.0" - -if (( snapshot )); then - S="${WORKDIR}/${PN}" -fi - -src_unpack() { - unpack ${A} - cd "${S}" - - if (( snapshot )); then - eautoreconf - fi -} - -src_compile() { - set -- \ - --with-gdk-pixbuf \ - $(use_with audiofile) \ - $(use_with esd) - - 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 -} diff --git a/x11-wm/sawfish/sawfish-1.6.2.ebuild b/x11-wm/sawfish/sawfish-1.6.2.ebuild deleted file mode 100644 index 421fbac90740..000000000000 --- a/x11-wm/sawfish/sawfish-1.6.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# 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 -} diff --git a/x11-wm/sawfish/sawfish-1.6.3.ebuild b/x11-wm/sawfish/sawfish-1.6.3.ebuild index 8238843ed046..6d813630b636 100644 --- a/x11-wm/sawfish/sawfish-1.6.3.ebuild +++ b/x11-wm/sawfish/sawfish-1.6.3.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.6.3.ebuild,v 1.1 2010/05/31 20:05:17 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.6.3.ebuild,v 1.2 2011/03/27 13:06:12 nirbheek Exp $ + +EAPI="1" # 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] ]] @@ -28,7 +30,7 @@ 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 + >=x11-libs/gtk+-2.12.0:2 nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} -- cgit v1.2.3-65-gdbad