Version bump (bug 425510 by Timothy Messier)

(Portage version: 2.1.11.5/cvs/Linux x86_64)

3 files changed, 82 insertions, 2 deletions

diff --git a/x11-wm/spectrwm/ChangeLog b/x11-wm/spectrwm/ChangeLog
index 2f4702a32a84..3dba72596e7f 100644
--- a/x11-wm/spectrwm/ChangeLog
+++ b/x11-wm/spectrwm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.2 2012/02/18 03:34:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/spectrwm/ChangeLog,v 1.3 2012/07/09 16:28:17 xmw Exp $
+
+*spectrwm-1.1.1 (09 Jul 2012)
+
+  09 Jul 2012; Michael Weber <xmw@gentoo.org>
+  +files/spectrwm-1.1.1-makefile.patch, +spectrwm-1.1.1.ebuild:
+  Version bump (bug 425510 by Timothy Messier)
 
   18 Feb 2012; Michael Weber <xmw@gentoo.org> spectrwm-1.0.0.ebuild:
   Fix PREFIX parameter.
@@ -46,4 +52,3 @@
   +files/scrotwm-0.9.28-makefile.patch, +metadata.xml:
   Initial import, thanks to Massimo Gengarelli, Nikolay Ostanen and Toffanin
   for the initial ebuilds (bug 284350)
-
diff --git a/x11-wm/spectrwm/files/spectrwm-1.1.1-makefile.patch b/x11-wm/spectrwm/files/spectrwm-1.1.1-makefile.patch
new file mode 100644
index 000000000000..86cc3c73e202
--- /dev/null
+++ b/x11-wm/spectrwm/files/spectrwm-1.1.1-makefile.patch
@@ -0,0 +1,32 @@
+--- spectrwm-1.1.1/linux/Makefile
++++ spectrwm-1.1.1/linux/Makefile
+@@ -1,5 +1,5 @@
+-CFLAGS+= -Wall -g -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)
+ 
+@@ -29,10 +29,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/spectrwm-1.1.1.ebuild b/x11-wm/spectrwm/spectrwm-1.1.1.ebuild
new file mode 100644
index 000000000000..d276b8cfe0dc
--- /dev/null
+++ b/x11-wm/spectrwm/spectrwm-1.1.1.ebuild
@@ -0,0 +1,43 @@
+# 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}"
+}