From 5575826c17fefa8771c130bf2186eb044cdabf69 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sat, 26 Jun 2010 14:01:17 +0000 Subject: [PATCH] Version bump, drop old and broken, will segfault with glibc-2.12 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- x11-wm/wmii/ChangeLog | 7 ++- x11-wm/wmii/Manifest | 9 +-- x11-wm/wmii/files/wmii-3.6-64bit-safe.patch | 8 --- x11-wm/wmii/wmii-3.6-r2.ebuild | 58 ------------------- .../{wmii-3.9.ebuild => wmii-3.9.2.ebuild} | 5 +- 5 files changed, 11 insertions(+), 76 deletions(-) delete mode 100644 x11-wm/wmii/files/wmii-3.6-64bit-safe.patch delete mode 100644 x11-wm/wmii/wmii-3.6-r2.ebuild rename x11-wm/wmii/{wmii-3.9.ebuild => wmii-3.9.2.ebuild} (87%) diff --git a/x11-wm/wmii/ChangeLog b/x11-wm/wmii/ChangeLog index c5ae860491a8..d1d69cc0765b 100644 --- a/x11-wm/wmii/ChangeLog +++ b/x11-wm/wmii/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-wm/wmii # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.33 2010/06/22 15:10:52 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.34 2010/06/26 14:01:17 ssuominen Exp $ + +*wmii-3.9.2 (26 Jun 2010) + + 26 Jun 2010; Samuli Suominen +wmii-3.9.2.ebuild: + Version bump. 22 Jun 2010; Jeroen Roovers wmii-3.6-r2.ebuild, wmii-3.9.ebuild: diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest index 91075eb0ebae..7eb402a8992d 100644 --- a/x11-wm/wmii/Manifest +++ b/x11-wm/wmii/Manifest @@ -1,11 +1,8 @@ AUX wmii-2_050802.patch 1015 RMD160 1733e59413d375b385de912d8f48f3a1f7d5776d SHA1 a72bc43b0a40dda12d74f5050f94a0ff63e76b1e SHA256 4b514fbee6e9042017cc5259ef3c4d100ee9040cb55b5dddda26d3c97ff749a7 -AUX wmii-3.6-64bit-safe.patch 188 RMD160 2c1e2abc99b6ecf6789cb85c6365e96cac0d8c27 SHA1 56273d3ca1dd420df08207a84f937385fb360598 SHA256 7cf2500d3d1f445c9a1aebd91a42ecfeb84fd90806306d95a89b92ffc42946b2 AUX wmii.desktop 121 RMD160 ce7d82f84e2ae07609d94516587cbe0d0caa96c4 SHA1 155f9f65d21929e2af359d7e6f2513adf44c8136 SHA256 36770dab753dc2e6745dac9c02bc8f76f21e44c526d6dabbae97949dbbacd8f2 -DIST wmii+ixp-3.9-4.tbz 431940 RMD160 ad0ac600f1defc6bdb1795646f4e1aa4996f6a27 SHA1 6fe5adf2b686c9de55a754598def6092589659a8 SHA256 372f22fcc788a587ecdff865d50df420ce78106d6908225c55a727735aec7b2d +DIST wmii+ixp-3.9.2.tbz 432032 RMD160 8a401a5d0a033c0da254d15e7fe415ec40e7a332 SHA1 e85a2979a0bd0a1db7ed486fc709afe72bafd8b0 SHA256 0466f1a5c534b0ee9fdace2c7a2d251845b7ec0ae80bdb8e68ae6584ebeebf2b DIST wmii-2.tar.bz2 67004 RMD160 80aaca41643e9632dc63341b63f80a6c1c92e6d8 SHA1 76c2bbe0970f57fa160f13c2ae37a009e84bf5b7 SHA256 d5025527bb04ce34e082f6298cbede72ff36f6a94f2e21582290bcf16b558767 -DIST wmii-3.6.tar.gz 208249 RMD160 29462b9ecc7d68e8e00e5f3eec82c2a46e268a52 SHA1 48e24f84f60b9c6ce37f715a46bc32e35d2086f3 SHA256 46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216 EBUILD wmii-2.ebuild 1725 RMD160 bfd1f0dd795e5005cc766754d59041a1b768c5e1 SHA1 2695753061c0df613464eacc7664cef8ae749dc3 SHA256 fba1bacd9169deee53dfe5906bb7f470075d56a3d5602122e95d928e71176e46 -EBUILD wmii-3.6-r2.ebuild 1392 RMD160 f311a7050f5718cea071eccb1858a4391d2effd6 SHA1 d678ad318a31bf5328ba3dc1deea212e95fd3956 SHA256 5ce96e60620af2dad10dbbde416d92a922d968dba8e8c9a5795a2db6a64540cf -EBUILD wmii-3.9.ebuild 1301 RMD160 48b6e8eb092ec1ec05747435ed94cea60d0decac SHA1 51bdf02a6e9bf01cca69a0cca648aee0c3a483c9 SHA256 56125b61ce8a101806c98f55789a9a3fa682212f7b5681a1dc293252dd865742 -MISC ChangeLog 5152 RMD160 849eadb4fc88da9f28f1de18565ef74fd46dde89 SHA1 a75878333f821c8e7f93d400b7338b6a5bb78b2b SHA256 b1b7e6e8c53dfcf211005eb15e452f39c68bf71c4dcfe5ecb78a29c7d0029de0 +EBUILD wmii-3.9.2.ebuild 1294 RMD160 ef56c081acdf3edc8e26ac47c7b8c1a87608245b SHA1 94276c22f7e60288f4968e352b77162bbf9c9165 SHA256 f73fc2b450ed662a6ca366d85ffdc9b28bf243cc0b9e0f3a5701203f4ce251dd +MISC ChangeLog 5276 RMD160 bf2ccfe338044da0cf41578a0bf632503aaba455 SHA1 85cde37db1e314460a3834ca9fa77ae9d3c883cf SHA256 ea0428e3a958ede997e2227ffd664c69ca54e5d36cc77bcb0b57149d272517e8 MISC metadata.xml 596 RMD160 0393838f1da4a5783906f5dfb820201f7b1e21a6 SHA1 7af8ccb9f0a48904e923ab610f1fa7199fbad301 SHA256 dc4ec29b62ec8e8d41c91f30f34da4cce7f51ce898516ecd94428512676b059e diff --git a/x11-wm/wmii/files/wmii-3.6-64bit-safe.patch b/x11-wm/wmii/files/wmii-3.6-64bit-safe.patch deleted file mode 100644 index 6cdf06833dca..000000000000 --- a/x11-wm/wmii/files/wmii-3.6-64bit-safe.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- mk/gcc.mk.orig 2009-06-11 12:06:32.819113775 +0200 -+++ mk/gcc.mk 2009-06-11 12:07:37.719827797 +0200 -@@ -1,5 +1,4 @@ - CFLAGS += \ -- -std=c99 \ - -pipe \ - -Wall \ - -Wno-parentheses \ diff --git a/x11-wm/wmii/wmii-3.6-r2.ebuild b/x11-wm/wmii/wmii-3.6-r2.ebuild deleted file mode 100644 index 0d768559278f..000000000000 --- a/x11-wm/wmii/wmii-3.6-r2.ebuild +++ /dev/null @@ -1,58 +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/wmii/wmii-3.6-r2.ebuild,v 1.4 2010/06/22 15:10:52 jer Exp $ - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="A dynamic window manager for X11" -HOMEPAGE="http://wmii.suckless.org/" -SRC_URI="http://www.suckless.org/download/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc64 ~x86" -IUSE="" - -DEPEND="~sys-libs/libixp-0.4 - x11-libs/libX11" -RDEPEND="${DEPEND} - x11-apps/xmessage - x11-apps/xsetroot - x11-misc/dmenu - media-fonts/font-misc-misc" - -src_unpack() { - unpack ${A} - cd "${S}" - - sed -i -e "s/dmenu -b/dmenu/" \ - rc/{rc.wmii.rc,sh.wmii,wmiirc.sh} || die "sed failed" - - sed -i \ - -e "/^PREFIX/s|=.*|= ${D}/usr|" \ - -e "/^ETC/s|=.*|= ${D}/etc|" \ - -e "/^LIBDIR/s|=.*|= /usr/$(get_libdir)|" \ - config.mk || die "sed failed" - - # bug 231299 - epatch "${FILESDIR}"/${P}-64bit-safe.patch -} - -src_compile() { - emake -j1 || die "emake failed" -} - -src_install() { - emake -j1 DESTDIR="${D}" install || die "emake install failed" - dodoc NOTES README TODO - - # Rid paths of temporary install directory. (bug #199551) - sed -i -e "s|${D}||g" "${D}/usr/bin/wmiistartrc" - - echo -e "#!/bin/sh\n/usr/bin/wmii" > "${T}/${PN}" - exeinto /etc/X11/Sessions - doexe "${T}/${PN}" - - insinto /usr/share/xsessions - doins "${FILESDIR}/${PN}.desktop" -} diff --git a/x11-wm/wmii/wmii-3.9.ebuild b/x11-wm/wmii/wmii-3.9.2.ebuild similarity index 87% rename from x11-wm/wmii/wmii-3.9.ebuild rename to x11-wm/wmii/wmii-3.9.2.ebuild index 788ac9623eb3..a67dfd3420a7 100644 --- a/x11-wm/wmii/wmii-3.9.ebuild +++ b/x11-wm/wmii/wmii-3.9.2.ebuild @@ -1,16 +1,15 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.9.ebuild,v 1.4 2010/06/22 15:10:52 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.9.2.ebuild,v 1.1 2010/06/26 14:01:17 ssuominen Exp $ EAPI=2 inherit flag-o-matic multilib MY_P=wmii+ixp-${PV} -PVER=4 DESCRIPTION="A dynamic window manager for X11" HOMEPAGE="http://wmii.suckless.org/" -SRC_URI="http://dl.suckless.org/wmii/${MY_P}-${PVER}.tbz" +SRC_URI="http://dl.suckless.org/wmii/${MY_P}.tbz" LICENSE="MIT" SLOT="0" -- 2.26.2