Version bump.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 124 insertions, 3 deletions

diff --git a/x11-wm/aewm/ChangeLog b/x11-wm/aewm/ChangeLog
index 5693733bbf43..2301d04cbb8d 100644
--- a/x11-wm/aewm/ChangeLog
+++ b/x11-wm/aewm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/aewm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm/ChangeLog,v 1.30 2013/10/19 15:19:33 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm/ChangeLog,v 1.31 2014/03/09 05:01:32 jer Exp $
+
+*aewm-1.3.12 (09 Mar 2014)
+
+  09 Mar 2014; Jeroen Roovers <jer@gentoo.org> +aewm-1.3.12.ebuild,
+  +files/aewm-1.3.12-gentoo.patch, metadata.xml:
+  Version bump.
 
   19 Oct 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due desktop-wm removal
diff --git a/x11-wm/aewm/aewm-1.3.12.ebuild b/x11-wm/aewm/aewm-1.3.12.ebuild
new file mode 100644
index 000000000000..4bff2caf4923
--- /dev/null
+++ b/x11-wm/aewm/aewm-1.3.12.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm/aewm-1.3.12.ebuild,v 1.1 2014/03/09 05:01:32 jer Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A minimalistic X11 window manager."
+HOMEPAGE="http://www.red-bean.com/~decklin/software/aewm/"
+SRC_URI="${HOMEPAGE}${P}.tar.bz2"
+
+LICENSE="MIT 9wm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	sed -i -e '/^font/s|".*"|"fixed"|g' doc/aewmrc.ex || die
+	sed -i -e 's|skill|pkill|g' doc/clientsrc.ex || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		MANDIR="${D}/usr/share/man/man1" \
+		XROOT="/usr" \
+		install
+
+	dodoc NEWS README
+}
diff --git a/x11-wm/aewm/files/aewm-1.3.12-gentoo.patch b/x11-wm/aewm/files/aewm-1.3.12-gentoo.patch
new file mode 100644
index 000000000000..6cc02f4560d6
--- /dev/null
+++ b/x11-wm/aewm/files/aewm-1.3.12-gentoo.patch
@@ -0,0 +1,63 @@
+--- a/Makefile
++++ b/Makefile
+@@ -6,12 +6,12 @@
+ XROOT = /usr/X11R6
+ 
+ # Uncomment to enable Shape extension support
+-#OPT_WMFLAGS += -DSHAPE
++OPT_WMFLAGS += -DSHAPE
+ #OPT_WMLIB += -lXext
+ 
+ # Uncomment to add Xft support
+-#OPT_WMFLAGS += -DXFT `pkg-config --cflags xft`
+-#OPT_WMLIB += `pkg-config --libs xft` -lXext
++OPT_WMFLAGS += -DXFT $(shell $(PKG_CONFIG) --cflags xft xext)
++OPT_WMLIB += $(shell $(PKG_CONFIG) --libs xft xext)
+ 
+ # Uncomment for debugging (abandon all hope, ye who enter here)
+ #OPT_WMFLAGS += -DDEBUG
+@@ -46,7 +46,7 @@
+ 
+ X11FLAGS = -I$(XROOT)/include
+ WMFLAGS = $(X11FLAGS) $(OPT_WMFLAGS)
+-GTKFLAGS = `pkg-config --cflags gtk+-2.0`
++GTKFLAGS = $(shell $(PKG_CONFIG) --cflags gtk+-2.0)
+ 
+ $(PLAINOBJ): %.o: %.c
+ 	$(CC) $(CFLAGS) -c $< -o $@
+@@ -60,28 +60,28 @@
+ $(GTKOBJ): %.o: %.c
+ 	$(CC) $(CFLAGS) $(GTKFLAGS) -c $< -o $@
+ 
+-X11LIB = -L$(XROOT)/lib -lX11
++X11LIB = $(shell $(PKG_CONFIG) --libs x11)
+ WMLIB = $(X11LIB) $(OPT_WMLIB)
+-GTKLIB = `pkg-config --libs gtk+-2.0`
++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0)
+ 
+ $(PLAINBIN): %: %.o
+-	$(CC) $^ -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+ 
+ $(X11BIN): %: %.o
+-	$(CC) $^ $(X11LIB) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(X11LIB) -o $@
+ 
+ $(WMBIN): %:
+-	$(CC) $^ $(WMLIB) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WMLIB) -o $@
+ 
+ $(GTKBIN): %: %.o
+-	$(CC) $^ $(GTKLIB) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(GTKLIB) $(X11LIB) -o $@
+ 
+ AEMAN = aewm.1x aeclients.1x
+ AERC = aewmrc clientsrc
+ 
+ install: all
+ 	mkdir -p $(BINDIR) $(MANDIR) $(CFGDIR)
+-	install -s $(ALLBIN) $(BINDIR)
++	install $(ALLBIN) $(BINDIR)
+ 	for i in $(AEMAN); do \
+ 	    install -m 644 doc/$$i $(MANDIR); \
+ 	    gzip -9 $(MANDIR)/$$i; \
diff --git a/x11-wm/aewm/metadata.xml b/x11-wm/aewm/metadata.xml
index d6d6d3af7c6a..aeb17f4fb96a 100644
--- a/x11-wm/aewm/metadata.xml
+++ b/x11-wm/aewm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+<maintainer><email>jer@gentoo.org</email></maintainer>
 	<longdescription>
 	aewm is a minimalist window manager for X11. It has no nifty features, 
 	but is light on resources and extremely simple in appearance. It should