gentoo resync : 21.06.2020

6 files changed, 50 insertions, 38 deletions

diff --git a/dev-libs/libmoe/Manifest b/dev-libs/libmoe/Manifest
index aa26ca3275f1..b66c8f642557 100644
--- a/dev-libs/libmoe/Manifest
+++ b/dev-libs/libmoe/Manifest
@@ -1,6 +1,5 @@
-AUX libmoe-1.5.8-gcc5.patch 1778 BLAKE2B cda472b2659b12d2225f0064a81ba4aadaf0eeb1ef9c86666d335a6e64120179156dd421ba0e9574c32a706ea710d48033d8627f84cbb184643123265319c6d2 SHA512 f4eff3250af69aa6751ac953047ef23275e7d5f39c4b850f4f7637e17c8cbe85c7146c3aa7412bbdc089ae787b2a49c72b0afc321bef523efd27bbf1784ff447
-AUX libmoe-1.5.8-gentoo.patch 304 BLAKE2B 45da8f6a3bd9d672362b0fb71b7123ea736500ecac9a72596649402a5fb8fa04eeb55c2a9ef95657dd230e34793632570c37873ab179896124fe3cfd1583312f SHA512 59e598ba12f907306a57ab22ddae823b882f9ee5407c5bcf1115ea477c1c98783807de7a35620c38af9defdf14d76a34897bc95d605739de276b3f146ace847d
-AUX libmoe-1.5.8-makefile.patch 625 BLAKE2B 0c2c23b03eaea5c023d9c65d7cee89cc8ac9c61e9776c694d9f387eedc5b9d8869168867c8bb34e428c89935697da54875a06e7f17c990caa4e0e2b156a7d5b4 SHA512 fa3a785363c4993b3b83bd94c624a2e6b8dababbccd6b2e522e0184d8d0563444c94cb1a67a155d45303081c1da234beeeded36382e582ee407eeceb7a3c630b
+AUX libmoe-gcc-5.patch 1778 BLAKE2B cda472b2659b12d2225f0064a81ba4aadaf0eeb1ef9c86666d335a6e64120179156dd421ba0e9574c32a706ea710d48033d8627f84cbb184643123265319c6d2 SHA512 f4eff3250af69aa6751ac953047ef23275e7d5f39c4b850f4f7637e17c8cbe85c7146c3aa7412bbdc089ae787b2a49c72b0afc321bef523efd27bbf1784ff447
+AUX libmoe-gentoo.patch 914 BLAKE2B 9d1c4dd7ef5f0fb6153673187948a0825a98fa2e5b7e38743f4518835775be406561f7263eb18d59ccdced328c6426cc810ed17d1c30be76daba92700e961b8f SHA512 a334503d845c2f3c61b2c8cbff966073dcf2b017f00de550f8c024dfe0d4a92ed85f2d065017fd84dda19970cd42b860ae61ddab72b284459edaf61990df640e
 DIST libmoe-1.5.8.tar.gz 1559398 BLAKE2B 14b167d4ee56fd4e448fb7fe006bd0b66c7fbb7709bfe5d124ec7010f1ae087511934e2ce0cd9d3e3360aad6ae096f56b7dc04643edd08fbecfdc2ca2572ca31 SHA512 937e7e0f1d562c5ea1f93ec755d6125f389cffaa2989b4ec4c1c1b42fab927f1884e1dab2c65e1487f4d9fdb0f9ed306a7d32e13e8b24302837a9e7b5634449b
-EBUILD libmoe-1.5.8-r3.ebuild 922 BLAKE2B 25e99bc500178c47942cd0e464f0bb697533de59ec8e32f18f678675d5eb1bed2e2b814f77c7623b3e19ec7f6e25bf49c6e80eef2b4fe3aeb4330f0b15a9ebff SHA512 c3d4bceaeecf18285cd473ff67200a8a7395ec3a4f2c8da984c99c6b86d7df5f8dd9dc5b829cc19a0b3082eab2f383fee01d625c0c42c208f500748046ccf36f
-MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
+EBUILD libmoe-1.5.8-r3.ebuild 1073 BLAKE2B 6f0a5a0b6af81f0ca02490b22bc15e430993255f05958b8007be95171a60ec8fb63461ce44a1d4712f1f6538903d043fcfd963e1bdd92044eda424630909004b SHA512 b5d1e9f0a56893f1ecb02ae961bb29f7ba8fa4fa49228e42e8d6eccd22397deae31aae9c99569feb4fabd321aa4262a09837acfe006134ab23460e20c1e9120d
+MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/dev-libs/libmoe/files/libmoe-1.5.8-gentoo.patch b/dev-libs/libmoe/files/libmoe-1.5.8-gentoo.patch
deleted file mode 100644
index cf436c11577b..000000000000
--- a/dev-libs/libmoe/files/libmoe-1.5.8-gentoo.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Naur libmoe-1.5.8.orig/altmalloc.c libmoe-1.5.8/altmalloc.c
---- libmoe-1.5.8.orig/altmalloc.c	2002-02-01 22:25:10.000000000 +0900
-+++ libmoe-1.5.8/altmalloc.c	2008-11-19 08:44:34.000000000 +0900
-@@ -1,3 +1,5 @@
-+#include <string.h>
-+
- #include "altmalloc.h"
- 
- alt_allocater_t alt_malloc = malloc;
diff --git a/dev-libs/libmoe/files/libmoe-1.5.8-gcc5.patch b/dev-libs/libmoe/files/libmoe-gcc-5.patch
index a990a37fe240..a990a37fe240 100644
--- a/dev-libs/libmoe/files/libmoe-1.5.8-gcc5.patch
+++ b/dev-libs/libmoe/files/libmoe-gcc-5.patch
diff --git a/dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch b/dev-libs/libmoe/files/libmoe-gentoo.patch
index 2cdfa1a24c22..c4a754bd2aa8 100644
--- a/dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch
+++ b/dev-libs/libmoe/files/libmoe-gentoo.patch
@@ -1,18 +1,26 @@
-diff --git a/Makefile b/Makefile
-index 1bae380..605d674 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -72,8 +72,7 @@ AR=ar
+@@ -52,8 +52,8 @@
+ INSTBIN=mbconv${EXT}
+ 
+ DEBUG=
+-CF=${DEBUG} -O2 -Wall -fpic -I.
+-LF=-shared -Wl,-soname,${DEST}.so.${VER}.${RELEASE}
++CF=${DEBUG} -O2 -Wall -fpic -I. ${CFLAGS}
++LF=-shared -Wl,-soname,${DEST}.so.${VER}.${RELEASE} ${LDFLAGS}
+ CC=gcc
+ CPP=gcc -E
+ LD=gcc
+@@ -72,7 +72,7 @@
  all: ${INSTLIBA} mbconv mbconv.man
  
  mbconv: mbconv.c ${ALL}
 -	${CC} ${CF} -o $@ $< -L. -lmoe
--
 +	${CC} ${CF} ${LDFLAGS} -o $@ $< -L. -lmoe
  
+ 
  ${DEST}.so: ${DEST}.so.${VER}.${RELEASE}
- 	ln -sf $< $@
-@@ -116,7 +115,7 @@ ${BTRI_Cs}: %.c: %.mk_btri.c mk_btri
+@@ -116,7 +116,7 @@
  	./mk_btri <$< >$@-new && mv $@-new $@
  
  mk_btri: btri.c btri.h altmalloc.o
@@ -21,3 +29,11 @@ index 1bae380..605d674 100644
  
  mbconv.man: mbconv.pod
  	pod2man --section=${MANSECT} --center=' ' $< >$@
+--- a/altmalloc.c
++++ b/altmalloc.c
+@@ -1,3 +1,5 @@
++#include <string.h>
++
+ #include "altmalloc.h"
+ 
+ alt_allocater_t alt_malloc = malloc;
diff --git a/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild b/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild
index 01e7722e7012..7d1017ce991b 100644
--- a/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild
+++ b/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 inherit toolchain-funcs
 
@@ -12,28 +12,34 @@ SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
+IUSE="static-libs"
 
 RDEPEND="dev-lang/perl"
 DEPEND="${RDEPEND}"
 
-HTML_DOCS=( libmoe.shtml )
+HTML_DOCS=( ${PN}.shtml )
 PATCHES=(
-	"${FILESDIR}/${P}-gentoo.patch"
-	"${FILESDIR}/${P}-makefile.patch"
-	"${FILESDIR}/${P}-gcc5.patch"	# taken from Debian
+	"${FILESDIR}/${PN}-gentoo.patch"
+	"${FILESDIR}/${PN}-gcc-5.patch"  # taken from Debian
 )
 
 src_prepare() {
 	default
 
 	sed -i \
-		-e "/^PREFIX=/s:=.*:=${EPREFIX}/usr:" \
-		-e "/^LIBSODIR=/s:=.*:=\$\{PREFIX}/$(get_libdir):" \
-		-e "/^MANDIR=/s:=.*:=\$\{PREFIX}/share/man:" \
-		-e "/^CF=/s:=:=${CFLAGS} :" \
-		-e "/^LF=/s:=:=${LDFLAGS} :" \
-		-e "s:=gcc:=$(tc-getCC):" \
-		-e "/^AR=/s:=ar:=$(tc-getAR):" \
+		-e "/^PREFIX=/s|=.*|=${EPREFIX}/usr|" \
+		-e "/^LIBSODIR=/s|=.*|=\${PREFIX}/$(get_libdir)|" \
+		-e "/^MANDIR=/s|=.*|=\${PREFIX}/share/man|" \
+		-e "/^MANCOMPR=/s|=.*|=cat|" \
+		-e "/^MANX=/s|=.*|=|" \
+		-e "/^\(CC\|LD\)=/s|=.*|=$(tc-getCC)|" \
+		-e "/^CPP=/s|=.*|=$(tc-getCPP)|" \
+		-e "/^RANLIB=/s|=.*|=$(tc-getRANLIB)|" \
+		-e "/^AR=/s|=.*|=$(tc-getAR)|" \
 		Makefile || die
 }
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.a' -delete || die
+}
diff --git a/dev-libs/libmoe/metadata.xml b/dev-libs/libmoe/metadata.xml
index c921b96adf6c..6f2ca22da233 100644
--- a/dev-libs/libmoe/metadata.xml
+++ b/dev-libs/libmoe/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 </pkgmetadata>