Version bump thanks to elvis4526 for the hint and Agostino Sarubbo for the patches...

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

diff --git a/x11-wm/scrotwm/ChangeLog b/x11-wm/scrotwm/ChangeLog
index 44c86b68cded963922ad22317059f8e47ffd706d..ab48556f777d8b8cd0854bc7a766842792527b88 100644 (file)
--- a/x11-wm/scrotwm/ChangeLog
+++ b/x11-wm/scrotwm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/scrotwm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/scrotwm/ChangeLog,v 1.1 2011/06/11 17:02:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/scrotwm/ChangeLog,v 1.2 2011/10/15 09:00:04 xmw Exp $
+
+*scrotwm-0.9.34 (15 Oct 2011)
+
+  15 Oct 2011; Michael Weber <xmw@gentoo.org> +scrotwm-0.9.34.ebuild,
+  +files/scrotwm-0.9.34-makefile.patch:
+  Version bump thanks to elvis4526 for the hint and Agostino Sarubbo for the
+  patch (bug 386159)
 
 *scrotwm-0.9.28 (11 Jun 2011)
 

diff --git a/x11-wm/scrotwm/Manifest b/x11-wm/scrotwm/Manifest
index a00e7377faaa952eaf3fc07087c63f34425316b6..5f9520d4f842ebebb134d9f34aa5fd7e22fb36b4 100644 (file)
--- a/x11-wm/scrotwm/Manifest
+++ b/x11-wm/scrotwm/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA256
 
 AUX scrotwm-0.9.28-makefile.patch 941 RMD160 51512234be802b9c5b4d8836566ccb76437be503 SHA1 2b00a6edfe75da25712aa538c30c7d8b9440de7a SHA256 2523ca652e3ae0ae2d7fb9092ada38d00252995e50560557454d37127832fe82
+AUX scrotwm-0.9.34-makefile.patch 1000 RMD160 0f119b561e11dc908b86ac7735b8360f19bdca2a SHA1 3ed16cdfbb7503e5a14bd649fda3d42219728e27 SHA256 81e2731ee8e1080a08a8be409c811f9864e73bc9e26adad04b86aed46492078a
 DIST scrotwm-0.9.28.tgz 62837 RMD160 b7b4186d02e65448117e15c8c4bf3b47aa146e24 SHA1 24cc73d01fd15e77dd3830902dd791759375037b SHA256 5579af32881caa9983f98d09a0ed24f3985ddde1d0c9f3298c0cc101029a750c
+DIST scrotwm-0.9.34.tgz 69755 RMD160 5a5cd30b65689f49f553bac379ae38d1a692dd0d SHA1 9e943883ea55048487fe59ed09b8a84467a81593 SHA256 46f055f3c1b7d32bcaaf94193fd01a727422e787e8a7afcf987db2ffdec9ada8
 EBUILD scrotwm-0.9.28.ebuild 751 RMD160 835578a122125689cc0a7f40640b1273584c04ea SHA1 a74cf32aebc39bc7e802404bf82927112eae497d SHA256 6b42603e95dc6cbae832e86340e6042f98a6dad61d8bf0d40f9658da3141eefe
-MISC ChangeLog 471 RMD160 987f43e8d4e768dc7ed2902b2732ff10741c0fff SHA1 7846e7235aba677191928d37e03e8fb7b885aa7e SHA256 9bf98fb00a00c09b663f7f32cf72c369dca405a908e8a7cb994e24157d7086ed
+EBUILD scrotwm-0.9.34.ebuild 769 RMD160 24a24e7a41cc40ed729889f7a4c852ebdef2a78b SHA1 cf413f585113b76858a68b3eea369266a5dee28b SHA256 8fe5621268060cee5ed14ba7cadcc269ab76d6453f37fc8746369ad8d0528873
+MISC ChangeLog 711 RMD160 ab964c7e34724b712616c07242fc052403f5d294 SHA1 f6a00d1a43285ab3a9180f8eab8ff19b1f52e3ec SHA256 ec95b80d0e55713116ca2ad5256f7b735e3c7fff81d147d6ee1674c40020e79f
 MISC metadata.xml 248 RMD160 fbc371bb7ae348f0607504a16f7a406d53c91ccf SHA1 865f2327a48abf34aa91cb715262a20a9b35d8e2 SHA256 c1168e4bf7a55150e29e8796925a7cf24a98b532e879b7134b8cb5f03cffbdea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3zn8EACgkQknrdDGLu8JDnUgD/W8V9dY1vOOhSUnzSbjK3WFaL
-bWOURhI6ES/onyqJR/cA/0qEbt98BAIb3OT/adwuv73LaRhwI9ZrzmZUmYc3ibZr
-=oI/A
+iF4EAREIAAYFAk6ZS5oACgkQknrdDGLu8JC1MQD/XGfHs8/fkdr0Lgp0ym4Lca3k
+iMz0myUKMrq6zn1zCbUA/1FYUNvfX6TyGFGPKq6+tOyKjIwqdEJiaOtD0RY9Ywth
+=cvIw
 -----END PGP SIGNATURE-----

diff --git a/x11-wm/scrotwm/files/scrotwm-0.9.34-makefile.patch b/x11-wm/scrotwm/files/scrotwm-0.9.34-makefile.patch
new file mode 100644 (file)
index 0000000..32a5c2c
--- /dev/null
+++ b/x11-wm/scrotwm/files/scrotwm-0.9.34-makefile.patch
@@ -0,0 +1,34 @@
+--- linux/Makefile.old 2011-10-08 12:02:29.917207139 +0200
++++ linux/Makefile     2011-10-08 12:05:42.244203200 +0200
+@@ -1,7 +1,7 @@
+ # $scrotwm: Makefile,v 1.6 2011/08/10 13:44:36 marco Exp $ 
+ 
+-CFLAGS+= -Wall -ggdb -D_GNU_SOURCE -I.
+-CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
++CFLAGS+= -D_GNU_SOURCE -I.
++CFLAGS+= -DSWM_LIB=\"libswmhack.so.$(LVERS)\"
+ LDADD+= -lX11 -lXrandr -lXtst
+ 
+ PREFIX?= /usr/local
+@@ -9,7 +9,7 @@
+ LIBDIR?= $(PREFIX)/lib
+ MANDIR?= $(PREFIX)/share/man
+ 
+-CC= gcc
++CC?= gcc
+ 
+ LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
+ 
+@@ -25,10 +25,10 @@
+       $(CC) $(LDFLAGS) -o $@ $+ $(LDADD)
+ 
+ %.so: %.c
+-      $(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@
++      $(CC) $(LDFLAGS) $(CFLAGS) -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/scrotwm/scrotwm-0.9.34.ebuild b/x11-wm/scrotwm/scrotwm-0.9.34.ebuild
new file mode 100644 (file)
index 0000000..6d18252
--- /dev/null
+++ b/x11-wm/scrotwm/scrotwm-0.9.34.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/scrotwm/scrotwm-0.9.34.ebuild,v 1.1 2011/10/15 09:00:04 xmw Exp $
+
+EAPI=3
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Small dynamic tiling window manager for X11"
+HOMEPAGE="http://www.scrotwm.org"
+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"
+
+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 || die
+}