gentoo resync : 22.05.2021

4 files changed, 79 insertions, 13 deletions

diff --git a/media-libs/libafterimage/Manifest b/media-libs/libafterimage/Manifest
index 122a609053bb..06c29fbd3845 100644
--- a/media-libs/libafterimage/Manifest
+++ b/media-libs/libafterimage/Manifest
@@ -1,9 +1,11 @@
+AUX libafterimage-ar.patch 1219 BLAKE2B a7f96ea3bd29cd2c4c34305b56b6bbfaf9341fb74f6456c441b6ac8da1d2a1965ec0d913ee229bf12b70ac1d37ede71aa48d6ae1888e31b2a853538813269889 SHA512 68af198e1f1c7ae1d4aa93f3ac05f4e6af4d91345ebeb56f2cf7899e4f94284667c5f9db136a5b1ce85e5ce6329003d726dc076448b959237bba45630404030a
 AUX libafterimage-config.patch 369 BLAKE2B fe12e682be9c55d4e3813181b1a9898536f5a2d33f47ce108eb52efc6526cb8407a4cd6a105c98f9804105a240793ab30fdaee9c333b24aa60c67df689e4fca5 SHA512 8d87d55d5d0df765e824418e3d79d2df2512d775f774896274388c28b5c64b8561cb7f346e327bd03975211f6c6a4e2aeb4af6c125766ddfa5c8087ca4a11de8
+AUX libafterimage-freetype.patch 855 BLAKE2B 35f2b187c516857e19c981c05dd5ce33fb5307f1c1b7b5feb296aaa307d659b53ed98ae634a4f3f0a10b355d07fe80645ebe2a9bdcf8051d5399452f4a0dd39f SHA512 87e85759c29c5dc31f28d0ed60939e1b9453f4bbb5dfdeaeaa68a5eb2b09006cdbd5248818ede642319a60408ad5a8ef4c2437cd89be6c86996e985cc6bfedb7
 AUX libafterimage-gif.patch 1436 BLAKE2B 228cbdc4f6b1a934a2f67e680ef2721b2797362fb757cc8bb625987783b33f9bdc01f9efda345330f714c5733f7cf21fd1ef9d717d938721dcc7a927290fd603 SHA512 d4f40c05be0174d2cc9f9ec9d4e911697716710d6ba451dc5d9c92581c84ff73c4a8ffe47f91ddd0917e873e3d141b2a1effa556e84f92dd7ff9cbc7eeb865ab
 AUX libafterimage-giflib5-v2.patch 11725 BLAKE2B 92ffc58146a513bb7aa0789d24ca3f39a2d4a57cecb37b2b2f3d14ce32f662c45abe17c27c409fc5bf1f0a9401364d429fb08e0362ce446910850869f356e7ef SHA512 57d53e7a2138825c6d59120247c3c4d0818710d661231316dc414d53d3e493b58fc98b6423595b3587a348de14eda15eaaf32e1284b4dcc38ce11097c3c97f70
 AUX libafterimage-libpng15.patch 1076 BLAKE2B 1de5fb2ea663842a0f843f5f2db14062021d4886bd4258da8e034cc6982086f532ff53fb0c2ed1cee7557ddd53be6d6baa9ccf6cd8f603d7d356e372fef594ec SHA512 67fff22ecb8d2027fecb50a6450b90d3be457c69c8d7c3c0cd16715ead2824634ae5b792cf3877585b74a1323c25934ab31d1462ea983557dc8acc4a6d11bc7a
 AUX libafterimage-makefile.in.patch 2168 BLAKE2B eae3d6ded2e08442d72014c9e054357ffc8dfa37b9f4be76debd6a3c6e4f54a661735eac54a5e4b12663e0365f46c49283efec21ec0e3130d6ede6c0be20e58c SHA512 0fab45a672d4cdecdbd792eb966a31d3ea7e7be7fae52b1e7080d96a513788502099dac41692b4cadfc062ee7fa24bfaceeed4931811488dc4f7c7c34a1e99ec
 DIST libAfterImage-1.20.tar.bz2 1017055 BLAKE2B 2a0c7de0a6e3369518e19d87c877401675533247f40bfc60f77ac48b52ee1ffc66feae34eb6f80a5e37415999d38db9f05ef06be88610d846a1077685decf1ce SHA512 4056c73d1ab401480803a3a932d647a66574df9f65efc0d30ba80800e1a3424b4fbfce8e9cdf82c4852862491d92cbb42392f8cce8d6ac21d3b49e4ffe1808c4
-EBUILD libafterimage-1.20-r2.ebuild 2678 BLAKE2B 5f72651d27ca2f1b341da4ba11bb724e8d835523c9d91a0af5ac1621b112676c0d6552314d6e8bd6c518cfc9d83691275622b3b425c39a212b55098ea7550e0d SHA512 171b53140e5ef261fa7a3214e79aa93960b0cd3818bda22a6fdaa81007a306a2491da74d70e0cfc46e1f3bfe5e6cd05bcce4c6c63476f2589aa26399d223795f
 EBUILD libafterimage-1.20-r3.ebuild 2616 BLAKE2B 5a675b26535616567447720dfc1c11d989b3cae58e2a63c04754231ed0eea52585dfe1778cb037d0fd3bdaf24fb73cb39db99c5d92e3f7848ae312d3759a614a SHA512 55328dd6dd1fe6aa5c5d74ce08ddb2b5312725ae177226d1d85f9575c3e3f518c24eee081d8dac93abd2ede943f2411a4f2bc8f3b62783b09b9553162172ff55
+EBUILD libafterimage-1.20-r4.ebuild 2778 BLAKE2B e5abc7d8cd6bdf6f92ea299a114a8d19495acdb39ea5123cc7df76477addb8d28dd0d552a48d5f2604dcd54d3b3d9f278e61eb01c6307fa11dcdd0713fa44440 SHA512 f987b94d84867f0fbbfdc20ee3cfe91b3a702d07bbcededf6cf96f54178a4a1e25ebd62976d495209e76eea657827da9bc95270a314c5480c1fb3519f97a6d27
 MISC metadata.xml 1093 BLAKE2B e95588bdee3a0fbb8d586f551f79b704807f8677bf9bc6e81882f65262d3c74f01d295019d77a5486c227b8c78067a7fe05776c864dae04da2acebb5c99fbd5a SHA512 d0a2fcc071c5ebe0fff77f80c6e663885181001ce1e2ea3e39ca6950e50332d4d6eaf560008ade8e72d6294d182ecaead1e9b30e7d5abb193bae2f2c75318018
diff --git a/media-libs/libafterimage/files/libafterimage-ar.patch b/media-libs/libafterimage/files/libafterimage-ar.patch
new file mode 100644
index 000000000000..6e8d0bb8cd46
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-ar.patch
@@ -0,0 +1,39 @@
+diff '--color=auto' -Naurd libAfterImage-1.20.orig/Makefile.in libAfterImage-1.20/Makefile.in
+--- libAfterImage-1.20.orig/Makefile.in	2011-01-15 08:52:22.000000000 +0300
++++ libAfterImage-1.20/Makefile.in	2021-05-19 23:32:32.793826120 +0300
+@@ -78,7 +78,8 @@
+ EXTRA_DEFINES	= @DEFINE_XLOCALE@
+ 
+ RANLIB		= @RANLIB@
+-AR		= ar clq
++AR		?= ar
++AR		+= cq
+ CP		= @CP@
+ MV		= @MV@
+ RM		= @RM@
+diff '--color=auto' -Naurd libAfterImage-1.20.orig/aftershow/Makefile.in libAfterImage-1.20/aftershow/Makefile.in
+--- libAfterImage-1.20.orig/aftershow/Makefile.in	2011-01-15 08:52:22.000000000 +0300
++++ libAfterImage-1.20/aftershow/Makefile.in	2021-05-19 23:32:53.158905472 +0300
+@@ -11,7 +11,8 @@
+ EXTRA_DEFINES	= @DEFINE_XLOCALE@
+ 
+ RANLIB		= @RANLIB@
+-AR		= ar clq
++AR		?= ar
++AR		+= cq
+ CP		= @CP@
+ MV		= @MV@
+ RM		= @RM@
+diff '--color=auto' -Naurd libAfterImage-1.20.orig/apps/Makefile.in libAfterImage-1.20/apps/Makefile.in
+--- libAfterImage-1.20.orig/apps/Makefile.in	2011-01-15 08:52:22.000000000 +0300
++++ libAfterImage-1.20/apps/Makefile.in	2021-05-19 23:33:15.769993568 +0300
+@@ -8,7 +8,8 @@
+ EXTRA_DEFINES	= @DEFINE_XLOCALE@
+ 
+ RANLIB		= @RANLIB@
+-AR		= ar clq
++AR		?= ar
++AR		+= cq
+ CP		= @CP@
+ MV		= @MV@
+ RM		= @RM@
diff --git a/media-libs/libafterimage/files/libafterimage-freetype.patch b/media-libs/libafterimage/files/libafterimage-freetype.patch
new file mode 100644
index 000000000000..575a68fd7ca2
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-freetype.patch
@@ -0,0 +1,23 @@
+--- libAfterImage-1.20.orig/configure.in	2011-01-15 08:52:22.000000000 +0300
++++ libAfterImage-1.20/configure.in	2021-05-19 23:40:50.359764859 +0300
+@@ -561,9 +561,9 @@
+ else
+   if test "x$ttf_includes" = "xno"; then
+     AC_MSG_CHECKING(headers required by TTF support)
+-    if freetype-config --cflags >/dev/null  ;then
++    if pkg-config freetype2 --cflags >/dev/null  ;then
+ 	  present_incs="$CCFLAGS $x_includes";
+-	  for l in `freetype-config --cflags` ;	do
++	  for l in `pkg-config freetype2 --cflags` ;	do
+ 	    inc_found=no
+ 	    for p in `echo "$present_incs"` ; do
+ 		if test "x$l" = "x$p" ; then
+@@ -636,7 +636,7 @@
+     have_ttf=yes
+   fi
+   if test "$have_ttf" = yes; then
+-	  AFTERIMAGE_LIBS="`freetype-config --libs` $AFTERIMAGE_LIBS"
++	  AFTERIMAGE_LIBS="`pkg-config freetype2 --libs` $AFTERIMAGE_LIBS"
+   fi
+ fi;
+ AC_SUBST(TTF_INCLUDES)
diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
index f66921efd7c1..a682ba6f4eea 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools
 
 MY_PN=libAfterImage
@@ -12,8 +12,8 @@ SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm +shaping svg tiff truetype"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping svg tiff truetype"
 
 RDEPEND="
 	X?		( x11-libs/libSM
@@ -21,17 +21,15 @@ RDEPEND="
 			  x11-libs/libXrender )
 	gif?	( media-libs/giflib:0= )
 	jpeg?	( virtual/jpeg:0 )
-	opengl?	( virtual/opengl )
 	png?	( >=media-libs/libpng-1.4:0= )
 	svg?	( gnome-base/librsvg:2 )
 	tiff?	( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype )"
 DEPEND="${RDEPEND}
-	X?		( x11-base/xorg-proto )
-	virtual/pkgconfig
-	!!x11-wm/afterstep"
+	X?		( x11-base/xorg-proto )"
+BDEPEND="
+	virtual/pkgconfig"
 REQUIRED_USE="
-	opengl?	 ( X )
 	shaping? ( X )
 	shm?	 ( X )"
 
@@ -50,6 +48,10 @@ src_prepare() {
 	eapply -p0 "${FILESDIR}"/${PN}-libpng15.patch
 	# add giflib-5 API support, bug 571654
 	eapply "${FILESDIR}"/${PN}-giflib5-v2.patch
+	# fix ar: respect $(AR), bug 731044 and drop 'l' flag, bug 784182
+	eapply "${FILESDIR}"/${PN}-ar.patch
+	# detect freetype properly, bug 783375
+	eapply "${FILESDIR}"/${PN}-freetype.patch
 	# do not build examples
 	use examples || sed -i \
 		-e '/^all:/s/apps//' \
@@ -68,7 +70,6 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable cpu_flags_x86_mmx mmx-optimization) \
-		$(use_enable opengl glx) \
 		$(use_enable nls i18n) \
 		$(use_enable shaping) \
 		$(use_enable shm shmimage ) \
@@ -80,6 +81,7 @@ src_configure() {
 		$(use_with svg) \
 		$(use_with tiff) \
 		$(use_with truetype ttf) \
+		--disable-glx \
 		--enable-sharedlibs \
 		--with-xpm \
 		--without-builtin-gif \
@@ -101,7 +103,7 @@ src_install() {
 		doman ascompose.1
 		emake clean
 		rm Makefile* ascompose.1 || die
-		insinto /usr/share/doc/${PF}/examples
-		doins *
+		docinto examples
+		dodoc *
 	fi
 }