Version bump (thanks Levon 'noptrix' Kayan), drop old.

Package-Manager: portage-2.1.11.13/cvs/Linux x86_64

7 files changed, 27 insertions, 103 deletions

diff --git a/x11-wm/spectrwm/ChangeLog b/x11-wm/spectrwm/ChangeLog
index 10f16e7c2f28..eda786612193 100644
--- a/x11-wm/spectrwm/ChangeLog
+++ b/x11-wm/spectrwm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/spectrwm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/spectrwm/ChangeLog,v 1.4 2012/08/01 10:48:36 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/spectrwm/ChangeLog,v 1.5 2012/09/18 01:26:03 xmw Exp $
+
+*spectrwm-2.0.2 (18 Sep 2012)
+
+  18 Sep 2012; Michael Weber <xmw@gentoo.org>
+  +files/spectrwm-2.0.2-makefile.patch, +spectrwm-2.0.2.ebuild,
+  -files/spectrwm-1.0.0-makefile.patch, -files/spectrwm-1.1.1-makefile.patch,
+  -spectrwm-1.0.0.ebuild, -spectrwm-1.1.1.ebuild, spectrwm-1.2.0.ebuild:
+  Version bump (thanks Levon 'noptrix' Kayan), drop old.
 
 *spectrwm-1.2.0 (01 Aug 2012)
 
diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index 72bdaa0b7ed5..f7d05d4f986a 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX spectrwm-1.0.0-makefile.patch 1015 SHA256 107b7d8f24855e64525d69c30930c90c2ec11556e45fbc0322bec62742817c75 SHA512 52e8cb32268314effe84387b3ef0aa9aad782811448ae6229410ba6a27427595aa94cca6bf868a8a75d4934cf00e4b9011da0203943011cf63222b7251898e2e WHIRLPOOL 22a4d2ba7018b3fa5479c216ea069d491ad5eac54ea505bdf1f5961fbc678f30af2ad4fae2648f1c2d681bc6bfe82116c3e2b3ec358a9356d749e7a15ae2040c
-AUX spectrwm-1.1.1-makefile.patch 895 SHA256 a1dc1e7c15ef63cda621390bb396e788777bf832f3d0708fcc85a8aee836d92e SHA512 6e05ae002ec013900dad0a8866642eacb2ce46924d455b13cf5dd8bc900ccbb697d23c6db478a3f5f9e8b6f1b2c6d9662f06a2d5a3122f6868a3b10bb477eed2 WHIRLPOOL 24f1fadd1b7ab97a33156a47ae105ca1e8c4d77f7f87a64f40ceb3282fc92ccbc05ff3c574ef19ea35e8fa9438c153aabe4a698f1efa35cb7013ce429c1a1ed2
 AUX spectrwm-1.2.0-makefile.patch 1046 SHA256 218e7f4ddb56f941be9dc6d0e7bfc6c20b06a20100c51b954d597344edef2a88 SHA512 b3ff1fb4918124a6faa8fb2a6e69e5b832b537beb5e5e7699969999dda5e65fb8fe9754217a16c2434a558b69cbf79f73384ee8e219ba420e92248108cda615d WHIRLPOOL 1264fc4b0c1c3bb34984203b995e45685f2d7242e35ed055997a3d3cc228f6e2d18c79c5d9bb7ee238c3fdbf151d70917ec96485c7e96d4128a721fb6a722774
-DIST spectrwm-1.0.0.tgz 88112 SHA256 4cfd7ed7c61fdfc8c108e5efec4513ee14b32baa8d2b095465c62e7bfdd65998 SHA512 1e86aecf6e7922a46a8bcd6bfdb5c9e031bdfeac973e30d9f9e1f58f3f38d97d98c2f3781ff5aeb69446b67e9bd2c42e9f5055babbb4af27d0b9c3cb2c08dc33 WHIRLPOOL 8f87ca462eb773e5e1e95570a2fed0a5b17218cb239e9eb5d8f86fcbb89c984cec4551948caf3545392675618a554e305b89528cfc7e9c28882c2a0a033d1ec8
-DIST spectrwm-1.1.1.tgz 93045 SHA256 36daf5fb55d8215abbd64a3f98681a5c6a4a9141d08ec5efc57e33786619357f SHA512 d7c1f3c6773e45a7f42bb241d452b9ed624fe7a325bacc8fdd148fe821f9365eb3b689adf35678559071b1237987a15d4c7c6974ea6e40ac67eaa379d71c5a10 WHIRLPOOL c233f6dce3177aeaea320527fb01aa268caa94548667cf9013014fce4ae93c44ee5642958500d6faacffc970322160e310e9dadc22bacf52be1d344bb4bd242f
+AUX spectrwm-2.0.2-makefile.patch 898 SHA256 13aaa457763ede9664ad345515bb0351512899f9855f2a01d530ae70fc27a0e5 SHA512 5f12fed39c8e45a3cc90faa8592f25d56a281f711fd5463b39914d6b125f4824fc77cab49d59dc416601066705cb2b0d56576bab3380396b5dbddbf302d9067a WHIRLPOOL d112401566099c70b2c405806c55577cd2408d4807535adf538fa794848e8dc258a1b1a2874ee6f63e718ff6b9cb1875ab9ca872d155b42d77aca90e909e75af
 DIST spectrwm-1.2.0.tgz 97865 SHA256 67815101678b7acc5daee0dfd554af7554721be208e4e9eed41b006af04dd837 SHA512 956d625d8f09f244db540b5280ca735c66b6e47190f50adbbb0b20f18a76593c3830ae6dd63062f4c792f00e6647b94028f309f308923c96654b8a7422ab2723 WHIRLPOOL 51b358ca9b05f267163370a2746597166216ec4b226fd8fa73ed5e5b0452c5728949b06a0e3e0f8b41ae2d4976703f506a6a103e88979f5433d286f547771e80
-EBUILD spectrwm-1.0.0.ebuild 1016 SHA256 6ccbbba916a8c54f022c70fc25f93669525370f69c356acb688df782eb090e79 SHA512 5e6da05939415a4fa0c42cd1fbeef0dcca40f9b2da36732ad16f9c64de6ecb66ee9257a1c4026587e6ae3a2c1bd0da62dd64b05fd83834099894148f0099ae37 WHIRLPOOL f683a921678f5b7852ab368ce126ad374464d47681b5472897d9dece24e6f552ce4b63e8618be403030200eb6720d2c1d46b2465367bb37a70ba001977907363
-EBUILD spectrwm-1.1.1.ebuild 1016 SHA256 0e892dd69837e5bc620086746aedb8ae12320bda66f7deac66f6d84d24a191d4 SHA512 3c4222fca5cea735ce9920e1f2ffa10e7c3fbeb8252e8afe572a5d2caaec2c734fb0c2f5a8d8fb5fd0f45a693756c9e3ee9a22b2bb0ba666138eadf72c63f29b WHIRLPOOL 5dae348f8032ed5c2baec1a0e23cc400c618dd1a0d937178ca03baecf8a27f21ba26fcadb1cc7b1d3864348a4317d1a9bbbb8a70cc8a3b9b78ae5d5eb8733ba8
-EBUILD spectrwm-1.2.0.ebuild 1016 SHA256 38982dc3021d0327c4cabc6fbc0471c212dc26342ca982c8a547fdcc8ba44e5a SHA512 788ff5be64f22d02e7af775733496f1966930aa76dfecbc936f9094fb953509b92054acb2847470d925067543f96ef3c23dbe08f654682befa050723e49d4133 WHIRLPOOL 0a2757e2fbd645475ea554c5a274b5eedbb7d13c658f6b8bfaf4478d0868a055666c2a7f4fae634a3990b2ca2751ea3a5954e707c00a57deb0591700e924a854
-MISC ChangeLog 2110 SHA256 88d25af67ad160af6d2933e2a26f28af8094214aa01c114a317ec6a0adf07e25 SHA512 428f23ffa8457a86ac895734ebd8172b4d112f203705138c3f47216330d1c207d64b5e60c64e1d25b8ad58872705cef1e8b65456191312677535498daae15de5 WHIRLPOOL e92a5f7c17f522481bd5a58a972709ea42ed7246fed647611865694cf7d6ae6a3ade9b8a46e85741f8a7885da6ad9ba7c67a4eee71c440dbd2ac1159ee93f15d
+DIST spectrwm-2.0.2.tgz 100657 SHA256 f1c54c08f8d82bb62cf06c94d8c2a5470ac403265942fc2fc7673b45daef8451 SHA512 04d28d12a5d83ca46890750f5264f473fca601b52d7d78134ccab5b80b6cc04467d82d7ae7f34af6b80e1f0c400744391b6c9c959bcfd736c212196b49be20a6 WHIRLPOOL 6148c83a3e71f79cb064ef278fe38ed17c74693adef76add3ef5c083c74dcbc7dcf7bd121c525f21aa2a8d35fee2fbac5b74c8aeb64152e23038c93f10e572af
+EBUILD spectrwm-1.2.0.ebuild 1035 SHA256 bcc91bffc492a8a6a0fe2f07328ae15232b33f0820b857976d5748886cecc9d8 SHA512 2826d104dcc553382894dd195bc306b888589165f9691a1204b8199ab25b446260d0b4bed161b69c9a5d257774f1fff566aef52398244521f395d821a5e2ce9d WHIRLPOOL e6b2f8f7d85ef386b2e8024ad628e421fe34c3fc0b14767d263493cd48217990e7fe331b0e4286373696ebe4e787cba30bd3d3bab4e06a862fa47d7c2ca67af3
+EBUILD spectrwm-2.0.2.ebuild 1056 SHA256 b334df6648fa5a49da84663c397e4b73064170e4884d59c59710467aff513b1f SHA512 8e08a8037a7cd510c392d2c1abd9b1210a7c51c802d5a25a4214ef04fed51633dfbc82c1150e046aad67c6ace9dd08f325ec7a04dedd023b3d1736a032efb5f3 WHIRLPOOL c83bf7394cffb83688b8fae86ed8652fda424faf4dbe0dbbc3b2e7dc99e9c2541164fa81e89f3acc2d006dce5e85a4dcb9602fb5b42cddcae42c5cf3e5d42dd7
+MISC ChangeLog 2460 SHA256 daf39fc45738facfa44bafc3a1f4f22b3c60d8bc67b4b3930ec5d23bae153fd0 SHA512 94d4cf580bbb7cc9aecb2bc9a37ff59376d7465b14dfa99cac6e4a49394af69048955382969c46e4e46d8e6e901597ab2b1f1ba466aef03e0b33f886cd8769ed WHIRLPOOL e77e502369de805caeac395bcb0e828df1c8daa2f2bd9d4479103f90457cfb25c88da3aba8416ba5f2d6922fbf9a827acb2d52d35d10b229cb1edc2784cce933
 MISC metadata.xml 248 SHA256 c1168e4bf7a55150e29e8796925a7cf24a98b532e879b7134b8cb5f03cffbdea SHA512 f6be9c552c7054235815712a3af3bfd9069cea9bd9b07ce2754047ec3b0a242983330e3c17f6071ee2eac89b74c2989678652723b514e59a336879e3dc340111 WHIRLPOOL a573bfcdd698c07f8e21e09c1764b2e897db371126741c1fa62c62920aaa633f5c233d82695ac85cdf85b8ce1537693379844f4a2ec8720f7cdf3d73cc3df9d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAZCT0ACgkQknrdDGLu8JDyNwD+NDvbi+2tTDlvoOCH5xdpi7KQ
-0fU8GlBxkkdk6J+L+ZcA/0P922n3oXuZ3wlDBN/Knve7q70izzYfPxYe1BqC66O3
-=XB2Y
+iF4EAREIAAYFAlBXzbwACgkQknrdDGLu8JD5yAD/Wck1v5t94eCOfCtxPwdNFUBC
+iK0Z3B4v19sdsLDvg7kA/0lopdkRpwMSA2crvGcGSC7ar4pDrjHIcOVm81Jhp5Mm
+=buCV
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/spectrwm/files/spectrwm-1.0.0-makefile.patch b/x11-wm/spectrwm/files/spectrwm-1.0.0-makefile.patch
deleted file mode 100644
index fd54b4a36761..000000000000
--- a/x11-wm/spectrwm/files/spectrwm-1.0.0-makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- scrotwm-0.10.0/work/scrotwm-0.10.0/linux/Makefile.orig	2012-01-27 16:30:23.673422152 +0100
-+++ scrotwm-0.10.0/work/scrotwm-0.10.0/linux/Makefile	2012-01-27 16:32:12.309064021 +0100
-@@ -1,5 +1,5 @@
--CFLAGS+= -Wall -ggdb -D_GNU_SOURCE -I.
--CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
-+CFLAGS+= -Wall -D_GNU_SOURCE -I.
-+CFLAGS+= -DSWM_LIB=\"libswmhack.so.$(LVERS)\"
- LDADD+= -lX11 -lXrandr -lXtst
- 
- PREFIX?= /usr/local
-@@ -7,7 +7,7 @@
- LIBDIR?= $(PREFIX)/lib
- MANDIR?= $(PREFIX)/share/man
- 
--CC= gcc
-+CC ?= gcc
- 
- LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
- 
-@@ -24,10 +24,10 @@
- 	$(CC) $(LDFLAGS) -o $@ $+ $(LDADD)
- 
- %.so: %.c
--	$(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c -fpic -DPIC $+ -o $@
- 
- libswmhack.so.$(LVERS): swm_hack.so
--	$(CC) -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
-+	$(CC) $(LDFLAGS) -Wl,-soname,$@ -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
- 
- install: all
- 	install -m 755 -d $(DESTDIR)$(BINDIR)
diff --git a/x11-wm/spectrwm/files/spectrwm-1.1.1-makefile.patch b/x11-wm/spectrwm/files/spectrwm-2.0.2-makefile.patch
index 86cc3c73e202..6fa2d35bcc68 100644
--- a/x11-wm/spectrwm/files/spectrwm-1.1.1-makefile.patch
+++ b/x11-wm/spectrwm/files/spectrwm-2.0.2-makefile.patch
@@ -1,22 +1,13 @@
---- spectrwm-1.1.1/linux/Makefile
-+++ spectrwm-1.1.1/linux/Makefile
+--- spectrwm-2.0.2/linux/Makefile
++++ spectrwm-2.0.2/linux/Makefile
 @@ -1,5 +1,5 @@
--CFLAGS+= -Wall -g -D_GNU_SOURCE -I.
+-CFLAGS+= -Wall -Wextra -Wshadow -g -D_GNU_SOURCE -I. -I/usr/include/freetype2
 -CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
-+CFLAGS+= -Wall -D_GNU_SOURCE -I.
++CFLAGS+= -Wall -Wextra -Wshadow -D_GNU_SOURCE -I. -I/usr/include/freetype2
 +CFLAGS+= -DSWM_LIB=\"libswmhack.so.$(LVERS)\"
- LDADD+= -lX11 -lXrandr -lXtst
+ LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor
  
  PREFIX?= /usr/local
-@@ -7,7 +7,7 @@
- LIBDIR?= $(PREFIX)/lib
- MANDIR?= $(PREFIX)/share/man
- 
--CC= gcc
-+CC ?= gcc
- 
- LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
- 
 @@ -29,10 +29,10 @@
  	$(CC) $(LDFLAGS) -o $@ $+ $(LDADD)
  
diff --git a/x11-wm/spectrwm/spectrwm-1.1.1.ebuild b/x11-wm/spectrwm/spectrwm-1.1.1.ebuild
deleted file mode 100644
index d276b8cfe0dc..000000000000
--- a/x11-wm/spectrwm/spectrwm-1.1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/spectrwm/spectrwm-1.1.1.ebuild,v 1.1 2012/07/09 16:28:17 xmw Exp $
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Small dynamic tiling window manager for X11"
-HOMEPAGE="https://opensource.conformal.com/wiki/spectrwm"
-SRC_URI="http://opensource.conformal.com/snapshots/${PN}/${P}.tgz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-misc/dmenu"
-DEPEND="${DEPEND}
-	x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	!x11-wm/scrotwm"
-
-S=${WORKDIR}/${P}/linux
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	tc-export CC
-}
-
-src_install() {
-	emake PREFIX="${D}"/usr LIBDIR="${D}usr/$(get_libdir)" install
-
-	cd ${WORKDIR}/${P} || die
-
-	insinto /etc
-	doins ${PN}.conf
-	dodoc ${PN}_*.conf {initscreen,screenshot}.sh
-
-	elog "Example keyboard config and helpful scripts can be found"
-	elog "in ${ROOT}usr/share/doc/${PF}"
-}
diff --git a/x11-wm/spectrwm/spectrwm-1.2.0.ebuild b/x11-wm/spectrwm/spectrwm-1.2.0.ebuild
index 80459e9c8101..c4bf3d4348da 100644
--- a/x11-wm/spectrwm/spectrwm-1.2.0.ebuild
+++ b/x11-wm/spectrwm/spectrwm-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/spectrwm/spectrwm-1.2.0.ebuild,v 1.1 2012/08/01 10:48:36 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/spectrwm/spectrwm-1.2.0.ebuild,v 1.2 2012/09/18 01:26:03 xmw Exp $
 
 EAPI=4
 
@@ -20,6 +20,7 @@ DEPEND="${DEPEND}
 	x11-libs/libX11
 	x11-libs/libXrandr
 	x11-libs/libXtst
+	x11-libs/xcb-util
 	!x11-wm/scrotwm"
 
 S=${WORKDIR}/${P}/linux
diff --git a/x11-wm/spectrwm/spectrwm-1.0.0.ebuild b/x11-wm/spectrwm/spectrwm-2.0.2.ebuild
index 58bed0c1fe08..8371cf9116b9 100644
--- a/x11-wm/spectrwm/spectrwm-1.0.0.ebuild
+++ b/x11-wm/spectrwm/spectrwm-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/spectrwm/spectrwm-1.0.0.ebuild,v 1.2 2012/02/18 03:34:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/spectrwm/spectrwm-2.0.2.ebuild,v 1.1 2012/09/18 01:26:03 xmw Exp $
 
 EAPI=4
 
@@ -18,8 +18,10 @@ IUSE=""
 RDEPEND="x11-misc/dmenu"
 DEPEND="${DEPEND}
 	x11-libs/libX11
+	x11-libs/libXcursor
 	x11-libs/libXrandr
 	x11-libs/libXtst
+	x11-libs/xcb-util
 	!x11-wm/scrotwm"
 
 S=${WORKDIR}/${P}/linux