gentoo resync : 04.01.2018

8 files changed, 20 insertions, 282 deletions

diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 164c5c03984d..e87d9424702b 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,12 +1,5 @@
 AUX afterstep 29 BLAKE2B 9bd4a8ece18d1192c4b36c18c4ec8920069f8e7b82f0812bef902657bf0029137dc6a0f5bdaf1c5dd3102dd3c70697410a8edfb094292fbed375633ae59d2f88 SHA512 194b2af81df48b4c87704bee1db1d01c4cfac3a529f76d8d073fb1358aa95eb9e84a9c2a7da12983a64d61b63e2689b93a79b778007bb8bcdfad8574086ba852
 AUX afterstep-2.2.12-gcc5.patch 9374 BLAKE2B c80a928feb81c3cb53322add051c28fed30cca8bb54813ba1655fc7991e308086ada771ce87db0567c31274594060bfb986c0a805424f5d02d5f73de65605bdc SHA512 81f0998409d9d45f8a25d66cd1c0ae07d23f6ed40f77f56241aae9085d0098510058807f24310c557825ebd67a513cb0c67ff0430cb2f33d2e355e6482c2b491
-AUX afterstep-2.2.9-alpha.patch 475 BLAKE2B a85ed8c1f1e205931df1074215b12ec1e36af01b8309cff99564055f8ee3cac631802c247972f954f9656e12654c4a9eab5b436801ae6efdd55e60c65babec0e SHA512 7c963518b307346608948b956ef747c5cd5e437ee47682eb0352149dc4fc1a1995902097091882e1600bad1b0edd26e2ca2af797217372122b24b8cfbcd3ead1
-AUX afterstep-2.2.9-ldflags.patch 1374 BLAKE2B 60812f88e143fcaadfc7283bab692b4a7f7c22ec67035b2273ca92e0b30ddebfb2aff47091cc49a20cb0068e74b5058697376d96eaf6f0ffbfb8e695201fa939 SHA512 92640bfebcbb7f813112268ac18cf750530014b0bc1f187a57333b665f4234da4d0eb996b81517fc59ed3b507fced4a6ae8b0a9c255f2ae809cf1ecbaee43cdf
-AUX afterstep-2.2.9-libpng15.patch 1132 BLAKE2B d5a0a8152cf311b01208419f912bd04a6c32be23c855cb042a90995172ec30a258eda134e62f447050fcc544a635b6b21cad95b232ca1007d764206d02109b06 SHA512 9f025d870b7b16bbb63e7097847b528b70e54e3174e1b71b4f8925f9a79f472c4ee8dda957394708d6c65c94068f0ed81273dff4c57bf11d6cf08fff895a6c22
-AUX afterstep-2.2.9-make_session_data_file.patch 422 BLAKE2B d9b16da66fff130ff8d08ee76e45de91f8e967811473c024044d3a04a8fc74a1d05d0e084cb985d72bce91b06f9b4913acacd16468122f923da633c1e4cd131b SHA512 966955ed4bc74e727a2c3b2f521b322a32e29a14f1974aee1bedde5cbd06ac104509ed397ba5f2dda1cb6ee3a8aa63d0c90be1c243dd81704a4297403c6092f6
-AUX no-alternatives-2.2.9.patch 1214 BLAKE2B 9895eee166ff4348499a379be7055784b50e7f7ec6825a13fa6cb7954513faf971f3d4689b7b2a151aba739078fa28313d999235a5851ce7de0276aab39c3727 SHA512 d8d98d2f9cdab4818fbbc4050c0e5a6b244365e401996ffc2cd24e97fdb4f795ff396dd12766cd7c180bf0b717ac7f55c7072afc0761a526e529c300970b07fa
 DIST AfterStep-2.2.12.tar.bz2 6132233 BLAKE2B 44a597f55bd500f4bb34f499cc5f6f6a011b421d27fc118775fb9f3ff64d9553f5cb9e62aabcc8d0461ef53351e318ed0b6c0385654c40b2cc94d098e2040b05 SHA512 5cac6ce74b24cbcc5b8e8a6f7cc9308e110f0d09597af1fa0a8730d5f5111932a23332629bc4d372fc8d9583a514d97e35f747b17decf8d4ebfe5e3f20cdbbee
-DIST AfterStep-2.2.9.tar.bz2 6094706 BLAKE2B 0241bd4b96114b80637acef87208983edd8edaecb0c127a06e105507ce8731354a5c420c3aeedad5750e8ee374dceb20933f6472ee2b3bd2cc18e720df6e4de2 SHA512 1191d918785d3e57f1921b1df21639eeae3298fb5f0f6e23a551f47afc5f0e0c945bae17b1ab8ba908ab0bd8476f5d358051593ff977c442783f94bd2e655ea5
-EBUILD afterstep-2.2.12.ebuild 3448 BLAKE2B 198d150401f7138bc77925f56db2c4bfd1ed8720b9fe9695579855531a770bf5dd7278519b7980abd3e811d69757d848ca8038f85b09722f209310aa803b56b5 SHA512 b53d42a33b4f1c244c2116557a8da0c5be74b127e4afa174c08afd894699a379f688ebc4416b68944fde55117c47c1efb8914b67f1eaf3b7cfdb9cff0dfd2f32
-EBUILD afterstep-2.2.9.ebuild 3557 BLAKE2B 0ef0e0194d669513d7d3220615e3f9bd783ae1d9d75c3c8ad605a18bdd30ebf63e928a75c81af6297a949024262fd4366337b79f914d295db46ed9c06e49fe21 SHA512 9ed6878f48ef88704f51727a69a2f1ec6cc697007a40ba0755b8d8997d7941e2bf4dd85b037fdcf1df12ea9dbe2a1e3424e972162c72919b841800ff1dfb4cc0
+EBUILD afterstep-2.2.12.ebuild 3478 BLAKE2B 68162aa83bb77a90811ca89c038d3bca8ceb95cf190b1c0230b720922d09db64f16d10a19de55c097a311393c9c0a161c2621b350b5cada3732a833cc80ad5f1 SHA512 9d802b3eb03f890eb88be174771e4dda75e65d04320ecc822bf8faa7a7ce2100141aa2e6c9af2450080c406297e0bf4d78c36cc5c68b0b15fb11edc3b50dc95f
 MISC metadata.xml 245 BLAKE2B 6621b0f12423f517bfd4000262c79e57c5f68cd2ce8e47f1d9518998a4f273b6db6f7125d163dbbb09636a46e39e0203675438a7e54f88e644480c88a54d71c5 SHA512 9e09ae84ab10dd84251f53e570c7d5bef4a7e3cbfcbba3548d8e3f2a00545b69fb3d01a5905c0d95826b6d0bef822c5c20158c0e70314be191d1d47456aa9a43
diff --git a/x11-wm/afterstep/afterstep-2.2.12.ebuild b/x11-wm/afterstep/afterstep-2.2.12.ebuild
index d09d8688884e..00b9f27fb2fd 100644
--- a/x11-wm/afterstep/afterstep-2.2.12.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,15 +14,9 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="alsa debug dbus gif gtk jpeg cpu_flags_x86_mmx nls png svg tiff xinerama"
 
-RDEPEND="media-libs/freetype
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	jpeg? ( virtual/jpeg:= )
-	gif? ( >=media-libs/giflib-4.1.0 )
-	gtk? ( x11-libs/gtk+:2 )
-	png? ( media-libs/libpng:0= )
-	svg? ( gnome-base/librsvg:2 )
-	tiff? ( media-libs/tiff:0 )
+RDEPEND="
+	media-libs/freetype
+	sys-libs/readline:0=
 	x11-libs/libICE
 	x11-libs/libXext
 	x11-libs/libSM
@@ -31,14 +25,25 @@ RDEPEND="media-libs/freetype
 	x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXrender
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	jpeg? ( virtual/jpeg:= )
+	gif? ( >=media-libs/giflib-4.1.0 )
+	gtk? ( x11-libs/gtk+:2 )
+	png? ( media-libs/libpng:0= )
+	svg? ( gnome-base/librsvg:2 )
+	tiff? ( media-libs/tiff:0 )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
 	!!media-libs/libafterimage
 	x11-proto/xextproto
 	x11-proto/xproto
-	xinerama? ( x11-proto/xineramaproto )"
+	xinerama? ( x11-proto/xineramaproto )
+"
 
-S=${WORKDIR}/${PN}-devel-${PV}
+S="${WORKDIR}/${PN}-devel-${PV}"
 
 src_prepare() {
 	sed -i -e '/^install:/s:install.alternative ::' Makefile.in || die
diff --git a/x11-wm/afterstep/afterstep-2.2.9.ebuild b/x11-wm/afterstep/afterstep-2.2.9.ebuild
deleted file mode 100644
index 4a450484b1f4..000000000000
--- a/x11-wm/afterstep/afterstep-2.2.9.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="A feature rich NeXTish window manager"
-HOMEPAGE="http://www.afterstep.org/"
-SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
-
-# libAfterBase/libAfterImage are LGPL
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="alsa debug dbus gif gtk jpeg cpu_flags_x86_mmx nls png svg tiff xinerama"
-
-RDEPEND="
-	media-libs/freetype
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	jpeg? ( virtual/jpeg )
-	gif?  ( >=media-libs/giflib-4.1.0 )
-	gtk? ( x11-libs/gtk+:2 )
-	png? ( media-libs/libpng:0 )
-	svg? ( gnome-base/librsvg:2 )
-	tiff? ( media-libs/tiff:0 )
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libSM
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXrender
-	xinerama? ( x11-libs/libXinerama )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	xinerama? ( x11-proto/xineramaproto )
-	!!media-libs/libafterimage"
-
-S=${WORKDIR}/AfterStep-${PV}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/no-alternatives-${PV}.patch \
-		"${FILESDIR}"/${P}-make_session_data_file.patch \
-		"${FILESDIR}"/${P}-alpha.patch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-
-	sed -i \
-		-e '/CFLAGS="-O3"/d' \
-		libAfter{Base,Image}/configure || die
-
-	sed -i \
-		-e "/STRIP_BINARIES/s/-s//" \
-		autoconf/configure.in || die #252119
-
-	sed -i \
-		-e '/--with-builtin-gif/s/$with_gif/no/' \
-		autoconf/configure.in || die #253259
-
-	cd "${S}"/autoconf || die
-	eautoreconf
-	cp "${S}"/autoconf/autoconf/config.h.in "${S}"/autoconf || die
-	cp "${S}"/autoconf/configure "${S}" || die
-}
-
-src_configure() {
-	local myconf
-
-	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
-		--enable-audit --enable-trace --enable-trace-x"
-
-	#implied intent of debug means you need the frame pointers.
-	use debug && filter-flags -fomit-frame-pointer
-
-	# Explanation of configure options
-	# ================================
-	# --with-helpcommand="xterm -e man" -  Avoid installing xiterm
-	# --with-xpm - Contained in xfree
-	# --disable-availability - So we can use complete paths for menuitems
-	# --enable-ascp - The AfterStep ControlPanel is abandoned
-	# LDCONFIG - bug #265841
-
-	LDCONFIG=/bin/true econf \
-		$(use_enable alsa) \
-		$(use_enable cpu_flags_x86_mmx mmx-optimization) \
-		$(use_enable nls i18n) \
-		$(use_enable xinerama) \
-		$(use_with dbus dbus1) \
-		$(use_with gif) \
-		$(use_with gtk) \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff) \
-		$(use_with svg) \
-		--with-helpcommand="xterm -e man" \
-		--disable-availability \
-		--disable-staticlibs \
-		--enable-ascp=no \
-		${myconf}
-}
-
-src_compile() {
-	# gcc: ../libAfterConf/libAfterConf.a: No such file or directory
-	# make[1]: *** [PrintDesktopEntries] Error 1
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Create a symlink from MonitorWharf to Wharf
-	rm "${D}"/usr/bin/MonitorWharf
-	dosym /usr/bin/Wharf /usr/bin/MonitorWharf
-
-	# Handle the documentation
-	dodoc ChangeLog INSTALL NEW* README* TEAM UPGRADE
-	cp -pPR "${S}"/TODO "${D}"/usr/share/doc/${PF}/
-	dodir /usr/share/doc/${PF}/html
-	cp -pPR "${S}"/doc/* "${D}"/usr/share/doc/${PF}/html
-	rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
-
-	insinto /usr/share/xsessions
-	newins "${S}"/AfterStep.desktop.final AfterStep.desktop
-
-	# For desktop managers like GDM or KDE
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/afterstep
-}
diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch b/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch
deleted file mode 100644
index 307180b9bae0..000000000000
--- a/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-libAfterStep/alpha_header.h:15: error: conflicting types for 'strlen'
-
---- libAfterStep/asapp.h
-+++ libAfterStep/asapp.h
-@@ -15,10 +15,6 @@
- #include "sun_headers.h"
- #endif
- 
--#if defined(__alpha)
--#include "alpha_header.h"
--#endif /* NEEDS_ALPHA_HEADER */
--
- /* Some people say that AIX and AIXV3 need 3 preceding underscores, other say
-  * no. I'll do both */
- #if defined ___AIX || defined _AIX || defined __QNX__ || defined ___AIXV3 || defined AIXV3 || defined _SEQUENT_
\ No newline at end of file
diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch b/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch
deleted file mode 100644
index 5d27d7d8293f..000000000000
--- a/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Respect LDFLAGS
-
-http://bugs.gentoo.org/show_bug.cgi?id=325309
-
---- autoconf/Makefile.common.lib.in
-+++ autoconf/Makefile.common.lib.in
-@@ -245,7 +245,7 @@
- 	$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
- 
- $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS)
--	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
-+	$(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
- 	 $(LIB_OBJS)
- 
- install:	install.lib install.bin
---- libAfterImage/Makefile.in
-+++ libAfterImage/Makefile.in
-@@ -395,7 +395,7 @@
- 	$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
- 
- $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h
--	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
-+	$(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
- 	 $(LIB_OBJS)
- 
- install.man:
---- libAfterBase/Makefile.in
-+++ libAfterBase/Makefile.in
-@@ -325,7 +325,7 @@
- 	$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
- 
- $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS)
--	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
-+	$(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
- 	 $(USER_LD_FLAGS) $(LIBS_X) $(LIB_OBJS)
- 
- install:	install.lib
diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch b/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch
deleted file mode 100644
index b420489b3266..000000000000
--- a/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- libAfterImage/export.c
-+++ libAfterImage/export.c
-@@ -483,7 +483,7 @@
- 	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
-     if ( png_ptr != NULL )
-     	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
--			if( setjmp(png_ptr->jmpbuf) )
-+			if( setjmp(png_jmpbuf(png_ptr)) )
- 			{
- 				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
- 				info_ptr = NULL ;
---- libAfterImage/import.c
-+++ libAfterImage/import.c
-@@ -1251,7 +1251,7 @@
- 			 * the normal method of doing things with libpng).  REQUIRED unless you
- 			 * set up your own error handlers in the png_create_read_struct() earlier.
- 			 */
--			if ( !setjmp (png_ptr->jmpbuf))
-+			if ( !setjmp (png_jmpbuf(png_ptr)))
- 			{
- 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
- 
-@@ -1468,7 +1468,7 @@
- 
- static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
- {
--   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
-+   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
-    memcpy(data, buf->buffer, length);
-    buf->buffer += length;
- }
diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-make_session_data_file.patch b/x11-wm/afterstep/files/afterstep-2.2.9-make_session_data_file.patch
deleted file mode 100644
index 2c2f8bfeee3d..000000000000
--- a/x11-wm/afterstep/files/afterstep-2.2.9-make_session_data_file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/308649
-
-asgtklookedit.c:658:3: warning: implicit declaration of function ‘make_session_data_file’
-
---- libASGTK/asgtklookedit.c
-+++ libASGTK/asgtklookedit.c
-@@ -28,6 +28,7 @@
- #include "../libAfterStep/parser.h"
- #include "../libAfterStep/freestor.h"
- #include "../libAfterStep/mystyle.h"
-+#include "../libAfterStep/session.h"
- #include "../libAfterConf/afterconf.h"
- 
- #include <unistd.h>		   
diff --git a/x11-wm/afterstep/files/no-alternatives-2.2.9.patch b/x11-wm/afterstep/files/no-alternatives-2.2.9.patch
deleted file mode 100644
index 4195413c5eed..000000000000
--- a/x11-wm/afterstep/files/no-alternatives-2.2.9.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.in.orig	2008-08-08 18:59:39.000000000 +0200
-+++ Makefile.in	2008-08-08 19:00:51.000000000 +0200
-@@ -71,7 +71,8 @@
- 
- module.clean:
-  
--install:  install.alternative install.desktop install.wmprops mkdir
-+#install:  install.alternative install.desktop install.wmprops mkdir
-+install:  install.desktop install.wmprops mkdir
- 	@for I in ${subdirs} ; do if [ -d $$I ]; then (cd $$I; ${MAKE} install || exit 1); fi; done
- 
- install.bin: mkdir.bin
-@@ -86,11 +87,11 @@
- install.script: mkdir.bin
- 	@for I in ${subdirs}; do if [ -d $$I ]; then (cd $$I; ${MAKE} install.script || exit 1); fi; done
- 
--install.alternative:
--	@if update-alternatives --version > /dev/null 2>&1 ; then 	\
--		update-alternatives --install /etc/alternatives/x-window-manager x-window-manager $(AFTER_BIN_DIR)/afterstep 100; \
--		echo "added AfterStep as an x-window-manager alternative"; \
--	fi
-+#install.alternative:
-+#	@if update-alternatives --version > /dev/null 2>&1 ; then 	\
-+#		update-alternatives --install /etc/alternatives/x-window-manager x-window-manager $(AFTER_BIN_DIR)/afterstep 100; \
-+#		echo "added AfterStep as an x-window-manager alternative"; \
-+#	fi
- 	
- 
- install.desktop: AfterStep.desktop.final mkdir.share