gentoo resync : 25.08.2020

3 files changed, 130 insertions, 9 deletions

diff --git a/dev-libs/libbulletml/Manifest b/dev-libs/libbulletml/Manifest
index aa57a8793f90..f90dbf1fa6c5 100644
--- a/dev-libs/libbulletml/Manifest
+++ b/dev-libs/libbulletml/Manifest
@@ -1,5 +1,6 @@
+AUX libbulletml-0.0.6-Makefile.patch 3102 BLAKE2B 74c65615b08a8ac5650a837266dea98cdddd08623b33debbbdb4f6ce550f9c84bd363a5813d7cda3237d7e6e56a232ec5960ddea652d98ac0de5f62068d2561f SHA512 d3fb907e8220c23432f1f763e960f08a9e87affebbdd78b6d977710081ceaa33840fd59ca843fc6b615b1b4180440aa154721b6bafe1751f434d02184d367608
 AUX libbulletml-0.0.6-gcc43.patch 577 BLAKE2B 14fe2e1087addc3d4230bdeab2ea19a318c721b1fef66de2a090c153b0e3c6e40f015385db724c2f244fbef94c1c80f792e875899137eab622f4fa27b81dc7dc SHA512 ae8e162ed7297302e40f5139557362fb1271ae8278c9efc0ddff73ab10cad6ec59c0aa281f4eed39d56b3ca64d0e42f7a51fabc2ecaee98870dd8f6458251803
 AUX libbulletml-0.0.6-gcc46.patch 400 BLAKE2B 55fe3b5b3c8f0b29f9df22976ba1647feb5ec3bbfb366b6057211c3f65c1933f97fd6818a232563f0aa3ae03fb5a981d47412786d66aeaf13405694daa880767 SHA512 4f053c3e7a7fb33317f4ac1bf4801593bf16b9c08a219ef2636ead641c7d1147ce01db59d7b9ae315c674f95d3e2973387368e555fa4883fcbb1867ff5349894
 DIST libbulletml-0.0.6.tar.bz2 94529 BLAKE2B 7ec9a69c4385adacc476cacb3f88219a5a7b506a36ece6d430a1a5c470ffddfd20f8f355ac5391c542850b98edf0d40e9dea6061b6ad5da7afcc66b14656311b SHA512 4428d8088eefd2a1336eb963e8c65188b67a82d875cdcb51bad9ca7aa3c864b3453464daf1e6691d52120332fe3a078b9827136d214d9ca87fdd0cb81bb60150
-EBUILD libbulletml-0.0.6.ebuild 904 BLAKE2B 01872e65adae7dd8f898bfde9704b74a10a9bab404ba8744596a85b44515c1ebae6eb7852208825841e4cef5b8c7433bb7a68af3e6d5aae18e179add9ad5af40 SHA512 e92728d15989224258f7fe31970285ba7ac3c2597e5805dc9f87a2eea6a21744d47bd2ccc95e94376ea9e211fe62313b502da375d4661aa15f5e1faa3a8cc2ec
+EBUILD libbulletml-0.0.6.ebuild 817 BLAKE2B 89985e7a0c71e2f112bdb364da563fa5ed79473a3f0a63abbe7ea80b063ce1ed12d0246dc2b0d1359115035e9c726aed4825605d8f49e1e569acde1717e5868f SHA512 f445256bb5a20eb667995010c4dde596d152854660aff008974d8f3c4bdc8b396a3a9756708afccabb8d3f4ce17c2e3dddf201d4f2f03e73490f17fe6817289e
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/dev-libs/libbulletml/files/libbulletml-0.0.6-Makefile.patch b/dev-libs/libbulletml/files/libbulletml-0.0.6-Makefile.patch
new file mode 100644
index 000000000000..05400d2c506f
--- /dev/null
+++ b/dev-libs/libbulletml/files/libbulletml-0.0.6-Makefile.patch
@@ -0,0 +1,119 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,5 @@
+-CC = g++
+ INCLUDES = -I.
+ LIBS = tinyxml/tinyxml.o tinyxml/tinyxmlparser.o tinyxml/tinyxmlerror.o
+-#CXXFLAGS = -g -W -Wall -ansi -pedantic
+-#CXXFLAGS = -pg -g -W -Wall -ansi -pedantic
+-CXXFLAGS = -O2 -W -Wall -ansi -pedantic
+-CFLAGS = -O2
+ OBJS = bulletmlparser-tinyxml.o bulletmlparser.o bulletmltree.o calc.o formula-variables.o bulletmlrunner.o bulletmlrunnerimpl.o
+ 
+ all: libbulletml.a
+@@ -21,7 +16,7 @@
+ 	bison -y   calc.yy && mv y.tab.c calc.cpp
+ 
+ $(OBJS): %.o: %.cpp
+-	$(CC) -c $(CXXFLAGS) $(INCLUDES) $<
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) -c $< -o $@
+ 
+ doxy:
+ 	doxygen
+--- a/tinyxml/Makefile
++++ b/tinyxml/Makefile
+@@ -14,41 +14,6 @@
+ PROFILE        := NO
+ 
+ #****************************************************************************
+-
+-CC     := gcc
+-CXX    := g++
+-LD     := g++
+-AR     := ar rc
+-RANLIB := ranlib
+-
+-DEBUG_CFLAGS     := -Wall -Wno-unknown-pragmas -Wno-format -g -DDEBUG
+-RELEASE_CFLAGS   := -Wall -Wno-unknown-pragmas -Wno-format -O2
+-
+-LIBS		 :=
+-
+-DEBUG_CXXFLAGS   := ${DEBUG_CFLAGS} 
+-RELEASE_CXXFLAGS := ${RELEASE_CFLAGS}
+-
+-DEBUG_LDFLAGS    := -g
+-RELEASE_LDFLAGS  :=
+-
+-ifeq (YES, ${DEBUG})
+-   CFLAGS       += ${DEBUG_CFLAGS}
+-   CXXFLAGS     += ${DEBUG_CXXFLAGS}
+-   LDFLAGS      += ${DEBUG_LDFLAGS}
+-else
+-   CFLAGS       += ${RELEASE_CFLAGS}
+-   CXXFLAGS     += ${RELEASE_CXXFLAGS}
+-   LDFLAGS      += ${RELEASE_LDFLAGS}
+-endif
+-
+-ifeq (YES, ${PROFILE})
+-   CFLAGS   := ${CFLAGS} -pg
+-   CXXFLAGS := ${CXXFLAGS} -pg
+-   LDFLAGS  := ${LDFLAGS} -pg
+-endif
+-
+-#****************************************************************************
+ # Preprocessor directives
+ #****************************************************************************
+ 
+@@ -70,8 +35,8 @@
+ # Makefile code common to all platforms
+ #****************************************************************************
+ 
+-CFLAGS   := ${CFLAGS}   ${DEFS}
+-CXXFLAGS := ${CXXFLAGS} ${DEFS}
++CFLAGS   += ${DEFS}
++CXXFLAGS += ${DEFS}
+ 
+ #****************************************************************************
+ # Targets of the build
+@@ -98,7 +63,7 @@
+ #****************************************************************************
+ 
+ ${OUTPUT}: ${OBJS}
+-	${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
++	${CXX} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} ${EXTRA_LIBS}
+ 
+ #****************************************************************************
+ # common rules
+@@ -106,10 +71,10 @@
+ 
+ # Rules for compiling source files to object files
+ %.o : %.cpp
+-	${CXX} -c ${CXXFLAGS} ${INCS} $< -o $@
++	${CXX} ${CXXFLAGS} ${CPPFLAGS} ${INCS} -c $< -o $@
+ 
+ %.o : %.c
+-	${CC} -c ${CFLAGS} ${INCS} $< -o $@
++	${CC} ${CFLAGS} ${CPPFLAGS} ${INCS} -c $< -o $@
+ 
+ clean:
+ 	-rm -f core ${OBJS} ${OUTPUT}
+--- a/ygg/Makefile
++++ b/ygg/Makefile
+@@ -2,8 +2,6 @@
+ LIBS = 
+ #CXXFLAGS = -g -W -Wall
+ #CXXFLAGS = -pg -g -W -Wall
+-CXXFLAGS = -O2 -W -Wall
+-CFLAGS = -O2
+ OBJS = ygg.o
+ 
+ all: $(OBJS)
+@@ -12,7 +10,7 @@
+ 	rm -f *.o *.a
+ 
+ $(OBJS): %.o: %.cpp
+-	$(CXX) -c $(CXXFLAGS) $(INCLUDES) $<
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) -c $< -o $@
+ 
+ distdir:
+ 
diff --git a/dev-libs/libbulletml/libbulletml-0.0.6.ebuild b/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
index 045879e2c0f5..5bd9fa9717b4 100644
--- a/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
+++ b/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="A Library of Bullet Markup Language"
 HOMEPAGE="https://shinh.skr.jp/libbulletml/index_en.html"
 SRC_URI="https://shinh.skr.jp/libbulletml/${P}.tar.bz2"
@@ -10,25 +12,24 @@ SRC_URI="https://shinh.skr.jp/libbulletml/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 DEPEND="dev-libs/boost"
 RDEPEND=${DEPEND}
 
-PATCHES=( "${FILESDIR}"/${P}-gcc4{3,6}.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc4{3,6}.patch
+	"${FILESDIR}"/${P}-Makefile.patch
+)
 
 S="${WORKDIR}"/${PN#lib}/src
 
 src_prepare() {
 	default
 	rm -r boost || die
-
-	# don't override the system-wide flags
-	sed -i -e '/^CFLAGS =/d;/^CXXFLAGS =/d' Makefile ygg/Makefile || die
 }
 
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+src_configure() {
+	tc-export AR CXX
 }
 
 src_install() {