gentoo resync : 10.11.2019

3 files changed, 60 insertions, 61 deletions

diff --git a/dev-util/sgb/Manifest b/dev-util/sgb/Manifest
index 2a1f3e604890..d26879486406 100644
--- a/dev-util/sgb/Manifest
+++ b/dev-util/sgb/Manifest
@@ -1,5 +1,5 @@
 AUX sgb-20030623-destdir.patch 2315 BLAKE2B e902a3c7e0d9a3863f02443ef33840a7a318b1fd278d7226fd7e7812fe1ceb190829599a9b06e588ab1b05ac13bb2d829f667ad0b0556dc0fd5dea3be1643d2f SHA512 0e821be0bdeac661c229958a9227b315810f66ae420f10b720b2fe0a09f9a20510d97f47aa6cc69a9c79904925ac842771743d694bd82ca9621f4fc8f1b46f04
 AUX sgb-20030623-parallel-make-fix.patch 947 BLAKE2B 7996934e520cfbfd30c2e281786714ac4f728875df2635eb7e7c1e63a1edfcfd6eac4fc9289ef7fdbeeb71fed4691ac49ff562eb5f07c7530e596d158efc1969 SHA512 d86c32c5f0a1ec9e09a70bc8dc0581654986ada562bd37f77c3d28e16856f72f6d42eae23e1cffc35973b2701718ea1e03bd0addee61a94901efbb5af0bcbd50
 DIST sgb-2003-06-23.tar.gz 493974 BLAKE2B b4cf4e1fd9f2aba35937865d2c2075e206eabda9f56e7f5b844be8bd4684b2a220bb1d449f0b0ed431fd2603b92aaf0cfa0a7e88015e7870638b3d69cab7288f SHA512 f486317dd85dc11761c970ab2bc0c9193f8dd3fa0d114528e1b55fd935fa9cce9266dc595b2ebe3526214ce3e6a1b3dc747382b32cbfd518ffb6179d3463e874
-EBUILD sgb-20030623.ebuild 1315 BLAKE2B 75864561428c4c30773c75f4faa4a31ccddb306c38525b132cb20565232f4d882e6b62f6b03bf532c6cbe2d01743bd2760fa33a9c49a3b03955b64084f55c315 SHA512 8b3cce18500ed666949f650c6f361f197e09c9de6cc16a05f83e0e5301e1df37fbbfd825d301e37c8e37b3ed49154758e15cc133ba2dba817047a90a98a9264d
+EBUILD sgb-20030623-r1.ebuild 1188 BLAKE2B 78ba27a6cbaf78e4415e707add21a5abb16c6498b1db3b3b4a45878283ed07942a4558af735fea4f7da6f828189d1a6a047824ccef4ab12976c88adda86dfc6d SHA512 2245110ae052994ec575b9c9e97e052b02c3b10081b8cae2351e74b015cb2bf0a4b7998299356f464da835736288f58388c8485644cdf78a9b93b2170dc4dcf8
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/dev-util/sgb/sgb-20030623-r1.ebuild b/dev-util/sgb/sgb-20030623-r1.ebuild
new file mode 100644
index 000000000000..65303742afc9
--- /dev/null
+++ b/dev-util/sgb/sgb-20030623-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Stanford GraphBase"
+HOMEPAGE="ftp://labrea.stanford.edu/pub/sgb/"
+SRC_URI="ftp://labrea.stanford.edu/pub/sgb/sgb-${PV:0:4}-${PV:4:2}-${PV:6:2}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="virtual/tex-base"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}"/sgb-20030623-parallel-make-fix.patch
+	"${FILESDIR}"/sgb-20030623-destdir.patch
+)
+
+src_compile() {
+	local vars=(
+		CFLAGS="${CFLAGS}"
+		SGBDIR=/usr/share/${PN}
+		INCLUDEDIR=/usr/include/sgb
+		LIBDIR=/usr/$(get_libdir)
+		BINDIR=/usr/bin
+		#CWEBINPUTS=/usr/share/${PN}/cweb
+		#LDFLAGS="${LDFLAGS}"
+	)
+	# bug #299028
+	emake -j1 "${vars[@]}" lib demos tests
+}
+
+src_test() {
+	emake tests
+}
+
+src_install() {
+	local vars=(
+		SGBDIR=/usr/share/${PN}
+		INCLUDEDIR=/usr/include/sgb
+		LIBDIR=/usr/$(get_libdir)
+		BINDIR=/usr/bin
+		CFLAGS="${CFLAGS}"
+		# TODO: why are they commented out above?
+		LDFLAGS="${LDFLAGS}"
+		CWEBINPUTS=/usr/share/${PN}/cweb
+	)
+	emake DESTDIR="${D}" "${vars[@]}" install
+
+	# we don't need no makefile
+	rm "${D}"/usr/include/sgb/Makefile || die
+
+	dodoc ERRATA README
+}
diff --git a/dev-util/sgb/sgb-20030623.ebuild b/dev-util/sgb/sgb-20030623.ebuild
deleted file mode 100644
index 9c6726cd8d9c..000000000000
--- a/dev-util/sgb/sgb-20030623.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-DESCRIPTION="Stanford GraphBase"
-HOMEPAGE="ftp://labrea.stanford.edu/pub/sgb/"
-SRC_URI="ftp://labrea.stanford.edu/pub/sgb/sgb-${PV:0:4}-${PV:4:2}-${PV:6:2}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-DEPEND="virtual/tex-base"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/sgb-20030623-parallel-make-fix.patch
-	epatch "${FILESDIR}"/sgb-20030623-destdir.patch
-}
-
-src_compile() {
-	# bug #299028
-	emake -j1 \
-	CFLAGS="${CFLAGS}" \
-	SGBDIR=/usr/share/${PN} \
-	INCLUDEDIR=/usr/include/sgb \
-	LIBDIR=/usr/$(get_libdir) \
-	BINDIR=/usr/bin \
-	CFLAGS="${CFLAGS}" \
-	lib demos tests || die "Failed to build"
-	#CWEBINPUTS=/usr/share/${PN}/cweb \
-	#LDFLAGS="${LDFLAGS}" \
-}
-
-src_install() {
-	dodir /usr/share/${PN} /usr/include/sgb /usr/lib /usr/bin /usr/share/${PN}/cweb
-	emake \
-	DESTDIR="${D}" \
-	SGBDIR=/usr/share/${PN} \
-	INCLUDEDIR=/usr/include/sgb \
-	LIBDIR=/usr/$(get_libdir) \
-	BINDIR=/usr/bin \
-	CFLAGS="${CFLAGS}" \
-	LDFLAGS="${LDFLAGS}" \
-	CWEBINPUTS=/usr/share/${PN}/cweb \
-	install \
-	|| die "Failed to install"
-
-	# we don't need no makefile
-	rm "${D}"/usr/include/sgb/Makefile
-
-	dodoc ERRATA README
-}
-
-src_test() {
-	emake tests
-}