gentoo resync : 15.12.2019

3 files changed, 141 insertions, 0 deletions

diff --git a/x11-wm/aewm/Manifest b/x11-wm/aewm/Manifest
index 00c0d911e0e6..86e8b8405597 100644
--- a/x11-wm/aewm/Manifest
+++ b/x11-wm/aewm/Manifest
@@ -1,4 +1,6 @@
 AUX aewm-1.3.12-gentoo.patch 1690 BLAKE2B f8bb7d861f3852d48c4a4919d06138baaabb053546261fbeb8d6f6e79d49f7561381cc02a614cc17998e37d40e000df1def0be71c8417194ea448797c911e6c8 SHA512 39c4d3258b29550fc99ac088c84f83af40645ebe48013f053584dd60baf99d9e58e3c3b4f221835c5ba7da27f6cc66a5d387a74928d596ba4a99a38aabaafb32
+AUX aewm-1.3.12-r1-gentoo.patch 2259 BLAKE2B 427a3286dfdf7170866a2e8b73b14259f390553fb53fc60780c6e5a8c87c224b46d6fcecda2784a17024ded5e513c1ca6be71a5aad5bd7dd6a82e783e6a4c8d6 SHA512 e3039462193018661acf9ed6532c67034a1352e381bb378a41ca3493580dfe847fa244b41389c37b3882fb5d0db4a26b9c6067b25a47134cc2d39f88b53415c9
 DIST aewm-1.3.12.tar.bz2 36677 BLAKE2B f84d272b82408600b10a3d08523219484cfbefff1ea5134284759e8743ae29918ceba842de07c640ca6fbc52c875df93f30f1692239119afcefb5a28ba3aa55e SHA512 69435edf1ba99661464221070ab6708a875056d244ee73b2eba1ed2beefba52ac2418d37e0d8b9f0c7c8a382e9d8740215b9c7098eca4f39cdf73b3c894125f1
+EBUILD aewm-1.3.12-r1.ebuild 800 BLAKE2B f8f5eea9b6db3dadc7a3dd30e864324158f55fd917f0fffcefeebe97f2b9a41ef55ad145fdf3592debec8414b2649e3d36cff94ad1a14b3fcad7689c099c986b SHA512 b03191aa54b4090e80333dba75e3a0c027e2f758144170848bd081bd5c98a8e5a58422836c4623f1b8e6a8ac964304f8e9c57dd560eaedb1ee9f18ea48a8b5f8
 EBUILD aewm-1.3.12.ebuild 924 BLAKE2B 3e672f88b219b1ea92d04f73236f101236afc9df4ae0e87c9b9968966b6eede4eed8f4b8a70f548b4b2c4d66511d157c1794d76652cfb46738761c5e4f105097 SHA512 be091793244569e0d64bd6e004a675fb1872d0133c176b2060cf1f620d9e6cef4a190ffcc6e15bea09f27e4623799a82858a11be21860f4166123c754f7cfc6a
 MISC metadata.xml 559 BLAKE2B 262c00ea913f10dccedef6d9b086d19de9b2b210cba0dac9125cad36642149d76b669387682ce1fa09fd96cfc715e618e1cc9c758ab2a66838d6fcf7fdb6a182 SHA512 f9a2092397717d558532432ee9ccb9715923338145485b7655fa84b83d08c89d900c3baf16d60cf3d16e5d495d26f04d889371ab010aa3dc54bdff3d7fa04831
diff --git a/x11-wm/aewm/aewm-1.3.12-r1.ebuild b/x11-wm/aewm/aewm-1.3.12-r1.ebuild
new file mode 100644
index 000000000000..e0a143a90091
--- /dev/null
+++ b/x11-wm/aewm/aewm-1.3.12-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A minimalistic X11 window manager"
+HOMEPAGE="https://www.red-bean.com/decklin/aewm/"
+SRC_URI="${HOMEPAGE}${P}.tar.bz2"
+
+LICENSE="MIT 9wm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-r1-gentoo.patch
+)
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		MANDIR="${ED}"/usr/share/man/man1 \
+		XROOT="/usr" \
+		install
+
+	dodoc NEWS README
+}
diff --git a/x11-wm/aewm/files/aewm-1.3.12-r1-gentoo.patch b/x11-wm/aewm/files/aewm-1.3.12-r1-gentoo.patch
new file mode 100644
index 000000000000..a08aa2760ed4
--- /dev/null
+++ b/x11-wm/aewm/files/aewm-1.3.12-r1-gentoo.patch
@@ -0,0 +1,92 @@
+--- 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,37 +60,36 @@
+ $(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; \
+ 	done
+ 	for i in $(AERC); do \
+ 	    install -m 644 doc/$$i.ex $(CFGDIR)/$$i; \
+ 	done
+ 	for i in $(PLAINBIN) $(X11BIN) $(GTKBIN); do \
+-	    ln -sf aeclients.1x.gz $(MANDIR)/$$i.1x.gz; \
++	    ln -sf aeclients.1x $(MANDIR)/$$i.1x; \
+ 	done
+ 
+ clean:
+--- a/doc/aewmrc.ex
++++ b/doc/aewmrc.ex
+@@ -3,7 +3,7 @@
+ 
+ # Titlebar font. "fixed" is the default.
+ 
+-font "lucidasans-10"
++font "fixed"
+ 
+ # Window colors
+ 
+--- a/doc/clientsrc.ex
++++ b/doc/clientsrc.ex
+@@ -10,4 +10,4 @@
+     cmd "Gaim" "gaim"
+ end
+ 
+-cmd "Logout" "skill aesession"
++cmd "Logout" "pkill aesession"