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

(Portage version: 2.1.11.13/cvs/Linux x86_64)

6 files changed, 19 insertions, 92 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/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