3 files changed, 286 insertions, 28 deletions
diff --git a/dev-db/datadraw/Manifest b/dev-db/datadraw/Manifest
index 9e2146bed806..e0ba73cb683f 100644
--- a/dev-db/datadraw/Manifest
+++ b/dev-db/datadraw/Manifest
@@ -1,3 +1,4 @@
+AUX datadraw-3.1.1-buildsystem.patch 7368 BLAKE2B bc889c8ee2741a6aa363b32fce0caa6034fdc03244d5a2f23e973cd93018ada11d8e6b8759ad81ae32c5794154372f0978d7ea5eac74bdce567efee2712ad483 SHA512 580a96cb62ecac814b3b91caaddb793971491cfbaedf1fa2bcf3154e8acbac520996d1c3d575690f41b77e4463208585e3631f97f73da7fc839dc2f9d2eb5e1a
 DIST datadraw3.1.1.tar.gz 607914 BLAKE2B ec4f6bafce924edda39a19f4e29ec7ac5c52dafbb0e8412280fd232e91b2bdf525fc931518249857f5b35a2f76c40a5fb28493db6220dacd86113361f780d38d SHA512 64773b984cb9d6928ec486833ee03f07c6c5f21dcfcc446e21fe90eb432b7a09459ea65e24c46df70bc6b791dfc640caf16b6f6cdd8a35319969bb8ec7e65009
-EBUILD datadraw-3.1.1.ebuild 1002 BLAKE2B 47f1d82234b8e2548d0c3420a5fe40121d0d39530bb2c05d09ad442fc2a778b036566e7ac79df6ab6f86a3729fe0fd123576d4afaa4435873145e8850351ad84 SHA512 5ba2c3d348ce7533dff173a3ed5bbf710ef55f7a3dcadc5360581704a3ceae4857ab773ca74165c81faa1a84226d5d706a9996df16db80ea22d2837a602e545d
+EBUILD datadraw-3.1.1.ebuild 823 BLAKE2B 15a28bdcc6b059848d1340d0ed567cf2e09fc9990960c3e5f63d5375cb8c527aaa4f5d3d05372c734c7ebb813662a0c82e7a0d2bfbe18b226cae1151f095585c SHA512 14bd407d4ac16d8603543674e220fc19c00f9df00e9e86ca5cab06c496e110bda67b096f3f7a8087b550393f4bc56a660d93dfcd1869365e2b8296eb0204e9cd
 MISC metadata.xml 583 BLAKE2B bb602abc24fa9252a7fd6c6ef24acb1585209d7ff695f9e1d0e044672fbeffab42454fe309f9341d979ec01073241af1683aca8b3ff9b0aca2664861c7192c06 SHA512 a771756ad279d2183df72e74fb6c4df994515f7de99485fcc4ef59b6e5618ec06c192e674efee7a354b9ccb2def3f361ef19e46c1817d55af9dd9dec20f28467
diff --git a/dev-db/datadraw/datadraw-3.1.1.ebuild b/dev-db/datadraw/datadraw-3.1.1.ebuild
index 608c45988c11..584245a0341e 100644
--- a/dev-db/datadraw/datadraw-3.1.1.ebuild
+++ b/dev-db/datadraw/datadraw-3.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="feature rich database generator for high performance C applications"
 HOMEPAGE="http://datadraw.sourceforge.net/"
@@ -12,39 +12,33 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}${PV}/${PN}${PV}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
+IUSE="examples"
 
-DEPEND=""
-RDEPEND=""
+S="${WORKDIR}/${PN}${PV}"
 
-S=${WORKDIR}/${PN}${PV}
+PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch )
 
-src_prepare() {
-	tc-export CC
-	sed -e "/^CFLAGS=/s:-g -Wall:${CFLAGS}:" \
-		-i configure \
-		-i dataview/configure \
-		-i util/configure || die
-
-	sed -e '/^datadraw:/,+2s:\\$(CFLAGS):\\$(CFLAGS) \\$(LDFLAGS):' \
-		-i configure || die
+src_configure() {
+	tc-export AR CC
+	default
 }
 
 src_install() {
-	dobin ${PN}
+	dobin datadraw
 
-	insinto /usr/$(get_libdir)
-	for lib in util/*.a ; do
-		newins ${lib} lib$(basename ${lib})
+	local lib
+	for lib in util/*.a; do
+		newlib.a ${lib} lib${lib#*/}
 	done
-	insinto /usr/include
 
-	doins util/*.h
+	doheader util/*.h
+
+	HTML_DOCS=( www/index.html www/images )
+	einstalldocs
+	dodoc manual.pdf
 
-	dodoc README
-	if use doc ; then
-		dodoc manual.pdf
-		dohtml -r www/index.html www/images
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
-	use examples && dodoc -r examples
 }
diff --git a/dev-db/datadraw/files/datadraw-3.1.1-buildsystem.patch b/dev-db/datadraw/files/datadraw-3.1.1-buildsystem.patch
new file mode 100644
index 000000000000..8ef1156fb6d3
--- /dev/null
+++ b/dev-db/datadraw/files/datadraw-3.1.1-buildsystem.patch
@@ -0,0 +1,263 @@
+--- a/configure
++++ b/configure
+@@ -16,8 +16,8 @@
+ if [ "$CC" = "" ]; then
+     CC=gcc
+ fi
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -Iutil"
+-LIBS="util/ddutil-dbg.a"
++CFLAGS="${CFLAGS} -Wall -W -Wno-unused-parameter -Wno-unused-function -Iutil"
++LIBS="util/ddutil.a"
+ 
+ if [ "`uname -m`" = x86_64 ]; then
+     CFLAGS="$CFLAGS -m64"
+@@ -74,17 +74,17 @@
+ 
+ echo "
+ 
+-datadraw: \$(OBJECTS) util/ddutil-dbg.a
+-	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) -o datadraw
++datadraw: \$(OBJECTS) util/ddutil.a
++	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$(OBJECTS) \$(LIBS) -o datadraw
+ 
+ clean:
+ 	rm -f \$(OBJECTS)
+-	make -C util clean
++	+\$(MAKE) -C util clean
+ 
+ install: datadraw
+ 	install -d \$(PREFIX)/bin
+ 	install datadraw \$(PREFIX)/bin
+-	make -C util PREFIX=\$(PREFIX) install
++	+\$(MAKE) -C util PREFIX=\$(PREFIX) install
+ 
+ deb:
+ 	fakeroot debian/rules binary && sudo dpkg -i ../*.deb
+@@ -99,8 +99,8 @@
+ src/dvdatabase.h src/dvdatabase.c: src/Database.dd
+ 	datadraw src/Database.dd
+ 
+-util/ddutil-dbg.a:
+-	make -C util
++util/ddutil.a:
++	+\$(MAKE) -C util
+ 
+ " >> Makefile
+ 
+--- a/dataview/configure
++++ b/dataview/configure
+@@ -43,13 +43,8 @@
+     shift
+ done
+ 
+-if [ "$debugging" = "true" ]; then
+-    CFLAGS="-g -DDD_DEBUG $CFLAGS"
+-    LIBS="$LIBS ../util/ddutil-dbg.a"
+-else
+-    CFLAGS="-O2 $CFLAGS"
+-    LIBS="$LIBS ../util/ddutil.a"
+-fi
++CFLAGS="$CFLAGS"
++LIBS="$LIBS ../util/ddutil.a"
+ 
+ if [ ! -d obj ]; then
+     mkdir obj
+@@ -74,7 +69,7 @@
+ 
+ echo "
+ 
+-dataview: \$(OBJECTS) ../util/ddutil-dbg.a
++dataview: \$(OBJECTS)
+ 	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) -o dataview
+ 
+ clean:
+--- a/examples/array/configure
++++ b/examples/array/configure
+@@ -9,7 +9,7 @@
+ 
+ ../../datadraw Array.dd
+ 
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -I../../util"
++CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -I../../util"
+ LIBS=""
+ 
+ if [ "`uname -m`" = x86_64 ]; then
+@@ -28,8 +28,8 @@
+ 
+ echo "
+ 
+-array: ../../util/ddutil-dbg.a \$(OBJECTS)
+-	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) ../../util/ddutil-dbg.a -o array
++array: ../../util/ddutil.a \$(OBJECTS)
++	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) ../../util/ddutil.a -o array
+ 
+ htdatabase.c htdatabase.h: Array.dd
+ 	../../datadraw Array.dd
+--- a/examples/attributes/configure
++++ b/examples/attributes/configure
+@@ -9,7 +9,7 @@
+ 
+ ../../datadraw Attrtest.dd
+ 
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -I../../util"
++CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -I../../util"
+ LIBS=""
+ 
+ if [ "`uname -m`" = x86_64 ]; then
+@@ -28,8 +28,8 @@
+ 
+ echo "
+ 
+-attrtest: ../../util/ddutil-dbg.a \$(OBJECTS)
+-	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) ../../util/ddutil-dbg.a -o attrtest
++attrtest: ../../util/ddutil.a \$(OBJECTS)
++	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) ../../util/ddutil.a -o attrtest
+ 
+ htdatabase.c htdatabase.h: Attrtest.dd
+ 	../../datadraw Attrtest.dd
+--- a/examples/extension/configure
++++ b/examples/extension/configure
+@@ -12,7 +12,7 @@
+ ../../datadraw Graph.dd
+ ../../datadraw Color.dd
+ 
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -I../../util"
++CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -I../../util"
+ LIBS=""
+ 
+ if [ "`uname -m`" = x86_64 ]; then
+--- a/examples/graph/configure
++++ b/examples/graph/configure
+@@ -13,7 +13,7 @@
+ 
+ ../../datadraw -I ../../util Graph.dd
+ 
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -I../../util"
++CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -I../../util"
+ LIBS=""
+ 
+ if [ "`uname -m`" = x86_64 ]; then
+@@ -53,8 +53,8 @@
+ 	../../datadraw -I ../../util Graph.dd
+ 
+ ../../util/ddutilup.a:
+-	make -C ../../util clean
+-	make -C ../../util ddutilup.a
++	+\$(MAKE) -C ../../util clean
++	+\$(MAKE) -C ../../util ddutilup.a
+ 
+ clean:
+ 	rm -f \$(OBJECTS)
+--- a/examples/hash/configure
++++ b/examples/hash/configure
+@@ -9,7 +9,7 @@
+ 
+ ../../datadraw Hash.dd
+ 
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -I../../util"
++CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -I../../util"
+ LIBS=""
+ 
+ if [ "`uname -m`" = x86_64 ]; then
+@@ -28,8 +28,8 @@
+ 
+ echo "
+ 
+-hash: ../../util/ddutil-dbg.a \$(OBJECTS)
+-	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) ../../util/ddutil-dbg.a -o hash
++hash: ../../util/ddutil.a \$(OBJECTS)
++	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) ../../util/ddutil.a -o hash
+ 
+ htdatabase.c htdatabase.h: Hash.dd
+ 	../../datadraw Hash.dd
+--- a/examples/heap/configure
++++ b/examples/heap/configure
+@@ -13,7 +13,7 @@
+ 
+ ../../datadraw -I ../../util Heap.dd
+ 
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -I../../util"
++CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -I../../util"
+ LIBS=""
+ 
+ if [ "`uname -m`" = x86_64 ]; then
+@@ -53,8 +53,8 @@
+ 	../../datadraw -I ../../util Heap.dd
+ 
+ ../../util/ddutilup.a:
+-	make -C ../../util clean
+-	make -C ../../util ddutilup.a
++	+\$(MAKE) -C ../../util clean
++	+\$(MAKE) -C ../../util ddutilup.a
+ 
+ clean:
+ 	rm -f \$(OBJECTS)
+--- a/examples/sparse/configure
++++ b/examples/sparse/configure
+@@ -9,7 +9,7 @@
+ 
+ ../../datadraw Sparse.dd
+ 
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -I../../util"
++CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -I../../util"
+ LIBS=""
+ 
+ if [ "`uname -m`" = x86_64 ]; then
+@@ -28,8 +28,8 @@
+ 
+ echo "
+ 
+-sparse: ../../util/ddutil-dbg.a \$(OBJECTS)
+-	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) ../../util/ddutil-dbg.a -o sparse
++sparse: ../../util/ddutil.a \$(OBJECTS)
++	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) ../../util/ddutil.a -o sparse
+ 
+ htdatabase.c htdatabase.h: Sparse.dd
+ 	../../datadraw Sparse.dd
+--- a/util/configure
++++ b/util/configure
+@@ -16,7 +16,7 @@
+ if [ "$CC" = "" ]; then
+     CC=gcc
+ fi
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function"
++CFLAGS="${CFLAGS} -Wall -W -Wno-unused-parameter -Wno-unused-function"
+ 
+ if [ "`uname -m`" = "x86_64" ]; then
+     CFLAGS="$CFLAGS -m64"
+@@ -72,21 +72,14 @@
+ makeMakefileTop "u-dbg"
+ makeMakefileTop "up-dbg"
+ 
+-echo 'all: debug optimized
+-
+-debug dev:
+-	@echo "Making debug build:"
+-	@$(MAKE) -f Makefile ddutil-dbg.a CFLAGS="$(CFLAGS) -DDD_DEBUG"
+-	@$(MAKE) -f Makefile ddutilp-dbg.a CFLAGS="$(CFLAGS) -DDD_DEBUG"
+-	@$(MAKE) -f Makefile ddutilu-dbg.a CFLAGS="$(CFLAGS) -DDD_DEBUG"
+-	@$(MAKE) -f Makefile ddutilup-dbg.a CFLAGS="$(CFLAGS) -DDD_DEBUG"
++echo 'all: optimized
+ 
+ optimized opt rel:
+ 	@echo "Making release build:"
+-	@$(MAKE) -f Makefile ddutil.a CFLAGS="$(CFLAGS) -O2"
+-	@$(MAKE) -f Makefile ddutilp.a CFLAGS="$(CFLAGS) -O2"
+-	@$(MAKE) -f Makefile ddutilu.a CFLAGS="$(CFLAGS) -O2"
+-	@$(MAKE) -f Makefile ddutilup.a CFLAGS="$(CFLAGS) -O2"
++	@$(MAKE) -f Makefile ddutil.a CFLAGS="$(CFLAGS)"
++	@$(MAKE) -f Makefile ddutilp.a CFLAGS="$(CFLAGS)"
++	@$(MAKE) -f Makefile ddutilu.a CFLAGS="$(CFLAGS)"
++	@$(MAKE) -f Makefile ddutilup.a CFLAGS="$(CFLAGS)"
+ 
+ clean:
+ 	rm -f obj/* objp/* obju/* objup/* obj-dbg/* objp-dbg/* obju-dbg/* objup-dbg/* *.a
+@@ -120,7 +113,7 @@
+     UPPER_SUFFIX=`echo $SUFFIX | tr '[a-z]' '[A-Z]'`
+     UPPER_NONDBG_SUFFIX=`echo $NONDBG_SUFFIX | tr '[a-z]' '[A-Z]'`
+     echo "ddutil$SUFFIX.a: \$(OBJECTS$UPPER_SUFFIX)
+-	ar -rcs ddutil$SUFFIX.a \$(OBJECTS$UPPER_SUFFIX)
++	\$(AR) -rcs ddutil$SUFFIX.a \$(OBJECTS$UPPER_SUFFIX)
+ 
+ " >> Makefile
+