From: Samuli Suominen Date: Sun, 4 Jul 2010 09:14:04 +0000 (+0000) Subject: ppc64 stable wrt #306107 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5d7c5853c5934702afdca92f8c48b278c683cbec;p=gentoo.git ppc64 stable wrt #306107 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog index 6ce9d7cdbdf4..76e09825af56 100644 --- a/x11-wm/afterstep/ChangeLog +++ b/x11-wm/afterstep/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/afterstep # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.94 2010/06/27 11:15:43 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.95 2010/07/04 09:14:04 ssuominen Exp $ + + 04 Jul 2010; Samuli Suominen + afterstep-2.2.9.ebuild: + ppc64 stable wrt #306107 27 Jun 2010; Raúl Porcel afterstep-2.2.9.ebuild: alpha/ia64/sparc stable wrt #306107 diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest index 3d9ea1ea833e..9c87ff4cf6ca 100644 --- a/x11-wm/afterstep/Manifest +++ b/x11-wm/afterstep/Manifest @@ -2,10 +2,7 @@ AUX afterstep 29 RMD160 a1fafb8971d47c7cebfe972bb74bbef19de4ac52 SHA1 7ce7a198ae AUX afterstep-2.2.9-alpha.patch 475 RMD160 8945b4685e011e49a0c81c835cbe37bf275046c7 SHA1 d80c3791133c101fa4a914cd442d7b1afe9815e2 SHA256 3208d1126ba14fc8c39c537cea701b2c89bcf9f778645add0e3465ce74139cd6 AUX afterstep-2.2.9-make_session_data_file.patch 422 RMD160 b4e694ac6514d34dfbee5f6fe15ffa109e5bfbad SHA1 932abcf0c2fb469e45e95035244d97df40c8dfe1 SHA256 3fa0e494903d374db0da66de432e407889356cd50d1072aa4078516f5d31b5a3 AUX no-alternatives-2.2.9.patch 1214 RMD160 c6a02643da9c82c5228800a399ffd6ce89c0b542 SHA1 140e5d5d011df340ece7f36a88c7f49540786a89 SHA256 f7a87859d043b210dd309128c9338e938f695cf248d2987ae2b8535243405e4f -AUX no-alternatives.patch 1178 RMD160 de3efea2502d9f8f8dbe403a4cc5c2e796017afd SHA1 11e79670530f8c9846adbe2a4fbe2cfc53a9688e SHA256 c3849ba4cd53fa1de52ab3b743b194b005754577dbe661ad7ee23a4b3eef36fc -DIST AfterStep-2.2.4.tar.bz2 5707951 RMD160 74ab7c74afce8d5d669a1520a3c02f04882e05b9 SHA1 592da988696a0745c4bef240e49274b3915ee277 SHA256 e1787184faaee583435730666ef3dd1c221ced493ccd9ba0a06f94ac5e5b05ec DIST AfterStep-2.2.9.tar.bz2 6094706 RMD160 b332078efa50abde522438c825fca91f31c4d554 SHA1 dfd7dd912866316e93c3be7a8460d34b95cd54a2 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148 -EBUILD afterstep-2.2.4.ebuild 3694 RMD160 75c6e61d8ea1c4ab1433f2c23f3a46f307c29952 SHA1 3ac1affaea4e59d03e5467698f391f14c3bb5f25 SHA256 4a5417a12984e0af4068c8d2e518fbced473acbe242f9008df7f038ce66789e4 -EBUILD afterstep-2.2.9.ebuild 3657 RMD160 1dcaf90c4e0fddff76021e5a17fb7aba88b972ca SHA1 e0463738702b8b972a73769b2c40f18d92f426dd SHA256 f2df9c7185d96cfa7c794224517642ede1f33213015df91bc2c755fd2049da25 -MISC ChangeLog 13553 RMD160 caac060f8d1f189b4cbfb8ed3456fe8f84521545 SHA1 cd80b68d2a7ee9927aecbbea763ba8f2f5d50679 SHA256 f504b5a3c83072de18ba5c45e358b9416b374cfe204c2a9a07cfe3b6f4141b1f +EBUILD afterstep-2.2.9.ebuild 3658 RMD160 3da5388ab3ff39cddabed287fa4869d829917bda SHA1 50de99c66c83b29747033c95e3f2747d55d27dac SHA256 35f9d2ef0b94e4883a19b1208106198a3301f303efdb56c664fa72bd2d92bb0b +MISC ChangeLog 13663 RMD160 a35ca65e7806d0f87c26c200fafffb8bd3c7184a SHA1 22ed0ff8e3721934b1f20fb995938c412e2cd503 SHA256 62da4de0c95e7a8589556fad5bf19701effd5afb428e54cd41d75f46f306046a MISC metadata.xml 350 RMD160 8a78f43601183735a3e88e99953e83fa319a2c9c SHA1 a0887e36150abf9d32d108bd1339880ca2a21449 SHA256 ffc449f67b60b79df064e7843b19ce9c16ab0ccc495de3b9cd9b1a38bf6b0c26 diff --git a/x11-wm/afterstep/afterstep-2.2.4.ebuild b/x11-wm/afterstep/afterstep-2.2.4.ebuild deleted file mode 100644 index f33a8be56641..000000000000 --- a/x11-wm/afterstep/afterstep-2.2.4.ebuild +++ /dev/null @@ -1,126 +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/afterstep/afterstep-2.2.4.ebuild,v 1.17 2010/04/14 13:03:57 voyageur Exp $ - -inherit flag-o-matic eutils - -DESCRIPTION="AfterStep is a feature rich NeXTish window manager" -HOMEPAGE="http://www.afterstep.org" -SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2" - -# libAfterBase/libAfterImage are LGPL -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" -IUSE="debug gif jpeg mmx nls png tiff xinerama" - -RDEPEND="media-libs/freetype - png? ( >=media-libs/libpng-1.2.5 ) - jpeg? ( >=media-libs/jpeg-6b ) - gif? ( >=media-libs/giflib-4.1.0 ) - tiff? ( >=media-libs/tiff-3.5.7 ) - x11-libs/libICE - x11-libs/libXext - x11-libs/libSM - x11-libs/libXmu - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama )" -DEPEND="${RDEPEND} - x11-proto/xextproto - x11-proto/xproto - xinerama? ( x11-proto/xineramaproto ) - !media-libs/libafterimage" - -S=${WORKDIR}/AfterStep-${PV} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/no-alternatives.patch -} - -src_compile() { - local myconf - - use debug && myconf="--enable-gdb --enable-warn --enable-gprof - --enable-audit --enable-trace --enable-trace-x" - - #implied intent of debug means you need the frame pointers. - use debug && filter-flags -fomit-frame-pointer - - # Explanation of configure options - # ================================ - # --with-helpcommand="xterm -e man" - Avoid installing xiterm - # --with-xpm - Contained in xfree - # --with-ungif=no - Use giflib instead of libungif - # --disable-availability - So we can use complete paths for menuitems - # --enable-ascp - The AfterStep ControlPanel is abandoned - - econf \ - $(use_enable nls i18n) \ - $(use_enable mmx mmx-optimization) \ - $(use_enable xinerama) \ - $(use_with png) \ - $(use_with jpeg) \ - $(use_with gif) \ - $(use_with tiff) \ - --with-helpcommand="xterm -e man" \ - --with-ungif=no \ - --disable-availability \ - --disable-staticlibs \ - --enable-ascp=no \ - ${myconf} || die "configure failed" - - emake || die "emake failed" -} - -src_install() { - # see bug #31541 - dodir /usr/share/gnome/wm-properties - - # afterstep tries to detect the current resolution - # for documentation generation, causing access violations - # for the video device. bug #87356 - unset DISPLAY - - emake DESTDIR="${D}" install || die "make install failed" - - # This fixes a bug with shared libraries - rm "${D}"/usr/lib/{libAfterImage.a,libAfterBase.a} - cp -pPR "${S}"/libAfterImage/libAfterImage.so* "${D}"/usr/lib - cp -pPR "${S}"/libAfterBase/libAfterBase.so* "${D}"/usr/lib - cp -pPR "${S}"/libAfterConf/libAfterConf.so* "${D}"/usr/lib - cp -pPR "${S}"/libAfterStep/libAfterStep.so* "${D}"/usr/lib - - # Create a symlink from MonitorWharf to Wharf - rm "${D}"/usr/bin/MonitorWharf - dosym /usr/bin/Wharf /usr/bin/MonitorWharf - - # Handle the documentation - dodoc COPYRIGHT ChangeLog INSTALL NEW* README* TEAM UPGRADE - cp -pPR "${S}"/TODO "${D}"/usr/share/doc/${PF}/ - dodir /usr/share/doc/${PF}/html - cp -pPR "${S}"/doc/* "${D}"/usr/share/doc/${PF}/html - rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in} - - insinto /usr/share/xsessions - newins "${S}"/AfterStep.desktop.final AfterStep.desktop - - # For desktop managers like GDM or KDE - exeinto /etc/X11/Sessions - doexe "${FILESDIR}"/afterstep -} - -pkg_postinst() { - echo - einfo "To use AfterStep issue the following commands:" - einfo "mv ~/.xinitrc ~/xinitrc.old" - einfo "echo afterstep > ~/.xinitrc" - echo - einfo "If you like AfterStep please vote for it at" - einfo "http://www.PLiG.org/xwinman/vote.html !" - echo -} diff --git a/x11-wm/afterstep/afterstep-2.2.9.ebuild b/x11-wm/afterstep/afterstep-2.2.9.ebuild index 020c9c9f8e25..5afeee8ec86d 100644 --- a/x11-wm/afterstep/afterstep-2.2.9.ebuild +++ b/x11-wm/afterstep/afterstep-2.2.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.13 2010/06/27 11:15:43 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.14 2010/07/04 09:14:04 ssuominen Exp $ EAPI=2 inherit autotools flag-o-matic eutils @@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2" # libAfterBase/libAfterImage are LGPL LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86" +KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" IUSE="alsa debug dbus gif gtk jpeg mmx nls png svg tiff xinerama" RDEPEND="media-libs/freetype diff --git a/x11-wm/afterstep/files/no-alternatives.patch b/x11-wm/afterstep/files/no-alternatives.patch deleted file mode 100644 index f2308b07778a..000000000000 --- a/x11-wm/afterstep/files/no-alternatives.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.in.orig 2006-11-01 12:28:46.000000000 -0500 -+++ Makefile.in 2006-11-01 12:29:16.000000000 -0500 -@@ -70,7 +70,8 @@ - - module.clean: - --install: install.alternative install.desktop install.wmprops mkdir -+#install: install.alternative install.desktop install.wmprops mkdir -+install: install.desktop install.wmprops mkdir - @for I in ${subdirs} ; do if [ -d $$I ]; then (cd $$I; ${MAKE} install || exit 1); fi; done - - install.bin: mkdir.bin -@@ -85,11 +86,11 @@ - install.script: mkdir.bin - @for I in ${subdirs}; do if [ -d $$I ]; then (cd $$I; ${MAKE} install.script || exit 1); fi; done - --install.alternative: -- @if update-alternatives --version > /dev/null 2>&1 ; then \ -- update-alternatives --install x-window-manager x-window-manager $(AFTER_BIN_DIR)/afterstep 100; \ -- echo "added AfterStep as an x-window-manager alternative"; \ -- fi -+#install.alternative: -+# @if update-alternatives --version > /dev/null 2>&1 ; then \ -+# update-alternatives --install x-window-manager x-window-manager $(AFTER_BIN_DIR)/afterstep 100; \ -+# echo "added AfterStep as an x-window-manager alternative"; \ -+# fi - - - install.desktop: AfterStep.desktop.final mkdir.share