Fix build failure due to git-2 decommission

Signed-off-by: Chen, Chih-Chia <pigfoot@gmail.com>

14 files changed, 99 insertions, 123 deletions

diff --git a/dev-libs/libxs/Manifest b/dev-libs/libxs/Manifest
deleted file mode 100644
index 22c0bd2..0000000
--- a/dev-libs/libxs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD libxs-9999.ebuild 710 SHA256 89b8b866a6d12e1663f8766312c8577478299a5bc2bbbab76561908a62f0d19a SHA512 88714f327e5a60d9ffb5e22b8142cbb236193b58d73058b94bd9f4491d605149a3e3de89a5d320674ecd041f5f5f5a26fb2f0ce7952deb423402cbdbc527ac38 WHIRLPOOL 5975d2d99527c5a9dfe1f25ea7da0d6eac4b3471c2bed543e9db0fe29d52f7f96abff34ab16f735bd56ecd950f39efaa91b689ab86c0b70742e1805651bf32e9
diff --git a/dev-libs/libxs/libxs-9999.ebuild b/dev-libs/libxs/libxs-9999.ebuild
deleted file mode 100644
index 79e46e6..0000000
--- a/dev-libs/libxs/libxs-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
-    EGIT_REPO_URI="https://github.com/crossroads-io/${PN}.git
-                   git://github.com/crossroads-io/${PN}.git"
-    EGIT_MASTER="master"
-    inherit git-2
-fi
-
-DESCRIPTION="libxs is a library for building scalable and high performance distributed applications."
-HOMEPAGE="https://github.com/crossroads-io/libxs"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-RDEPEND="${DEPEND}"
-
-AUTOTOOLS_AUTORECONF=yes
-
-src_prepare() {
-    ./autogen.sh || die
-}
-
-src_install() {
-    autotools-utils_src_install
-}
diff --git a/dev-libs/mtbl/Manifest b/dev-libs/mtbl/Manifest
index 1214198..01200d3 100644
--- a/dev-libs/mtbl/Manifest
+++ b/dev-libs/mtbl/Manifest
@@ -1 +1 @@
-EBUILD mtbl-9999.ebuild 785 SHA256 fea29e5a0537afbf593f7c6347638ad71f264813a53d1732791209e3b3e4e573 SHA512 3cfc3e2cf69766be359e34a2f6722eb06cd2e5bf9d3ec1b6812369d3898c58864396b86cbe974a924186dbad9fefbc655adb2700d180566b1d2a1893b3233306 WHIRLPOOL c0ada177b7ebbc5ec240d9a6d39c2ab7de0161ddebe7c9b2ac1a9075492d1d0b8430b653821c60fbfa55f330e427d84fd3aa56d65051f42919c58e997dc7e40d
+DIST mtbl-1.3.0.tar.gz 179598 BLAKE2B 907186ea5104aadab2b39e9bf18d881cb1b595891c2ce5b1ea06828f39010e52d500d7aaae6a7defa67b66722cf7e4c06a08a707909478187938cbe76ffad7b7 SHA512 fb9a54537f8fbcf35f60f7d131d6b213260f72e230fbf1498e367d32093b162e2aad444ed6b15cd698033d290c6e32b2adfe8255bad977f30eb2e1ae0802003f
diff --git a/dev-libs/mtbl/mtbl-1.3.0.ebuild b/dev-libs/mtbl/mtbl-1.3.0.ebuild
new file mode 120000
index 0000000..02d1999
--- /dev/null
+++ b/dev-libs/mtbl/mtbl-1.3.0.ebuild
@@ -0,0 +1 @@
+mtbl-9999.ebuild
\ No newline at end of file
diff --git a/dev-libs/mtbl/mtbl-9999.ebuild b/dev-libs/mtbl/mtbl-9999.ebuild
index 046eec5..d97af2d 100644
--- a/dev-libs/mtbl/mtbl-9999.ebuild
+++ b/dev-libs/mtbl/mtbl-9999.ebuild
@@ -1,38 +1,40 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=5
+EAPI=7
 
-inherit eutils autotools-utils
+inherit autotools
 
-if [[ ${PV} == "9999" ]] ; then
-    EGIT_REPO_URI="https://github.com/farsightsec/${PN}.git
-                   git://github.com/farsightsec/${PN}.git"
-    EGIT_MASTER="master"
-    inherit git-2
+MY_PN="github.com/farsightsec/${PN}"
+MY_P="${P}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${MY_PN}"
+	EGIT_SUBMODULES=()
+else
+	EGIT_COMMIT="v${PV}"
+	MY_P="${PN}-tags-${EGIT_COMMIT}"
+	SRC_URI="https://${MY_PN}/archive/tags/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 fi
 
-DESCRIPTION="mtbl is a C library implementation of the Sorted String Table (SSTable) data structure."
+DESCRIPTION="mtbl is a C library implementation of the Sorted String Table (SSTable)
+	data structure."
 HOMEPAGE="https://github.com/farsightsec/mtbl"
 
 LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
+SLOT="0/${PVR}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 
 DEPEND="app-arch/snappy:=
-        sys-libs/zlib:="
-
+		sys-libs/zlib:="
 RDEPEND="${DEPEND}"
 
-AUTOTOOLS_AUTORECONF=yes
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-    ./autogen.sh || die
-}
-
-src_install() {
-    dodoc README* ChangeLog*
+	default
 
-    autotools-utils_src_install
+	eautoreconf
 }
diff --git a/dev-libs/nmsg/Manifest b/dev-libs/nmsg/Manifest
index fff2138..90f7fdc 100644
--- a/dev-libs/nmsg/Manifest
+++ b/dev-libs/nmsg/Manifest
@@ -1 +1 @@
-EBUILD nmsg-9999.ebuild 814 SHA256 9c4ac4cab329d3ddec8d3eefbe1fd666fde5f83c6ece705401944db09b131903 SHA512 c4fa156fbea658bc3774906429eb758c9df06837c3d14acb2b5133c1c49ffd7ff946766603cab0cbfd63a1dfb5d26c691bc22edada25578c77694e085d594de0 WHIRLPOOL 09073a91278a97d2dc16954bcba554ca6025890b0a705d3f31f82e0495a1bb2aa5a3542f820064a2056ec59323a1544ab854562be4a933c8fdb14fbab335a933
+DIST nmsg-0.15.1.tar.gz 342447 BLAKE2B 0d17d0942f43bb3ea974b4820887f22e4ffd34b635d57ed3010f2df4235c1e784fef70a23ecb51d942e8adf5e07a080ca8350c5a6e0ad4ec0fa7ca4bae43e3e7 SHA512 390800b3a32b0f1e8fb49838a21d9833e103eccbb67a0cac8739aae65501a9aa97487af2745bef54a7595a1f3c2634cffadf05219c5b090b46c4741459233d0f
diff --git a/dev-libs/nmsg/nmsg-0.15.1.ebuild b/dev-libs/nmsg/nmsg-0.15.1.ebuild
new file mode 120000
index 0000000..09f5647
--- /dev/null
+++ b/dev-libs/nmsg/nmsg-0.15.1.ebuild
@@ -0,0 +1 @@
+nmsg-9999.ebuild
\ No newline at end of file
diff --git a/dev-libs/nmsg/nmsg-9999.ebuild b/dev-libs/nmsg/nmsg-9999.ebuild
index d9840aa..d4c5d96 100644
--- a/dev-libs/nmsg/nmsg-9999.ebuild
+++ b/dev-libs/nmsg/nmsg-9999.ebuild
@@ -1,40 +1,43 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=5
+EAPI=7
 
-inherit eutils autotools-utils
+inherit autotools
 
-if [[ ${PV} == "9999" ]] ; then
-    EGIT_REPO_URI="https://github.com/farsightsec/${PN}.git
-                   git://github.com/farsightsec/${PN}.git"
-    EGIT_MASTER="master"
-    inherit git-2
+MY_PN="github.com/farsightsec/${PN}"
+MY_P="${P}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${MY_PN}"
+	EGIT_SUBMODULES=()
+else
+	EGIT_COMMIT="v${PV}"
+	MY_P="${PN}-tags-${EGIT_COMMIT}"
+	SRC_URI="https://${MY_PN}/archive/tags/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 fi
 
-DESCRIPTION="Network message encapsulation library."
+DESCRIPTION="network message encapsulation library"
 HOMEPAGE="https://github.com/farsightsec/nmsg"
 
 LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
+SLOT="0/${PVR}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 
 DEPEND="net-libs/libpcap:=
-        dev-libs/protobuf:=
-        dev-libs/protobuf-c:=
-        dev-libs/wdns:=
-        dev-libs/libxs:=
-        sys-libs/zlib:="
-
+		dev-libs/protobuf:=
+		dev-libs/protobuf-c:=
+		dev-libs/wdns:=
+		dev-libs/libxs:=
+		sys-libs/zlib:="
 RDEPEND="${DEPEND}"
 
-AUTOTOOLS_AUTORECONF=yes
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-    ./autogen.sh || die
-}
+	default
 
-src_install() {
-    autotools-utils_src_install
+	eautoreconf
 }
diff --git a/dev-libs/sie-nmsg/Manifest b/dev-libs/sie-nmsg/Manifest
index c409450..884c725 100644
--- a/dev-libs/sie-nmsg/Manifest
+++ b/dev-libs/sie-nmsg/Manifest
@@ -1 +1 @@
-EBUILD sie-nmsg-9999.ebuild 711 SHA256 1073981db41ce7f95def096b68e442aec75c97093a936eb73ee5a45be55427d6 SHA512 f09ab29dace2bf3a6100ffa828eef3abf1c7737e454f43a675b3ff94d8d1984d9039c03119183d7592ea0cbb3a30a3333a63747b17ea27d88c5bd2cb35169ed6 WHIRLPOOL 4ee9b97a8b235c9867fd03683f818635d72202d91347ac0e8fc2052c8457fffd311848cb236f31bcdd2f62608ce95cbcd83e7bfef1316990a0c690994e9ca730
+DIST sie-nmsg-1.2.1.tar.gz 23243 BLAKE2B 86c9b7835d32eabc491f6dd90ff13c51feaee808ffdf33208a1c4d3977428948f5d7beb9f45ceca3dfc4f5542473ce1d2a19a9a26c256c50cb07dccdaeec0794 SHA512 c28234ae0e9e89e4388f7baef28695482a34d7e6d305516d08ddc29b90f285a73e34f18e50df1181274d906524b7b0a275a1b9456e79fbe7057f69c24f161a11
diff --git a/dev-libs/sie-nmsg/sie-nmsg-1.2.1.ebuild b/dev-libs/sie-nmsg/sie-nmsg-1.2.1.ebuild
new file mode 120000
index 0000000..d36a8ce
--- /dev/null
+++ b/dev-libs/sie-nmsg/sie-nmsg-1.2.1.ebuild
@@ -0,0 +1 @@
+sie-nmsg-9999.ebuild
\ No newline at end of file
diff --git a/dev-libs/sie-nmsg/sie-nmsg-9999.ebuild b/dev-libs/sie-nmsg/sie-nmsg-9999.ebuild
index bb43037..444b281 100644
--- a/dev-libs/sie-nmsg/sie-nmsg-9999.ebuild
+++ b/dev-libs/sie-nmsg/sie-nmsg-9999.ebuild
@@ -1,36 +1,39 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=5
+EAPI=7
 
-inherit eutils autotools-utils
+inherit autotools
 
-if [[ ${PV} == "9999" ]] ; then
-    EGIT_REPO_URI="https://github.com/farsightsec/${PN}.git
-                   git://github.com/farsightsec/${PN}.git"
-    EGIT_MASTER="master"
-    inherit git-2
+MY_PN="github.com/farsightsec/${PN}"
+MY_P="${P}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${MY_PN}"
+	EGIT_SUBMODULES=()
+else
+	EGIT_COMMIT="v${PV}"
+	MY_P="${PN}-tags-${EGIT_COMMIT}"
+	SRC_URI="https://${MY_PN}/archive/tags/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 fi
 
-DESCRIPTION="SIE-specific message modules for libnmsg."
+DESCRIPTION="SIE-specific message modules for libnmsg"
 HOMEPAGE="https://github.com/farsightsec/sie-nmsg"
 
 LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
+SLOT="0/${PVR}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 
 DEPEND="dev-libs/nmsg:=
-        dev-libs/wdns:="
-
+		dev-libs/wdns:="
 RDEPEND="${DEPEND}"
 
-AUTOTOOLS_AUTORECONF=yes
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-    ./autogen.sh || die
-}
+	default
 
-src_install() {
-    autotools-utils_src_install
+	eautoreconf
 }
diff --git a/dev-libs/wdns/Manifest b/dev-libs/wdns/Manifest
index cf845e2..8a6c9cb 100644
--- a/dev-libs/wdns/Manifest
+++ b/dev-libs/wdns/Manifest
@@ -1 +1 @@
-EBUILD wdns-9999.ebuild 874 SHA256 295f9a2e36c342c6b01c9158185b617e11a98596217a2111c3ec95103bf40a87 SHA512 be9837a3f186485f30c5f468ca5383dcc107ba34b0f890bad43d91496f440802826b98bad963531676de469c15b4298994aa17548101ae142d376f5ee99130f3 WHIRLPOOL f6a9108a66698d3539c8902c89c65824cd4f16c0faeb8a433c119bc6024ca55a4ad2635add1bae502d8763b16f2a4cac8288a10495246d63600a39a95f7e3677
+DIST wdns-0.10.0.tar.gz 152891 BLAKE2B c1e1ce580dde456f78ccd221c40473260d1fcff1a07c8d5e46707aff9fbee900e7e9a5aae7b5f16ebe4018cebf9d3e95223a83fa2c23eeb3f0b4577768ee7e83 SHA512 849dc6d4483950e23bbc7b72b8e1a79830bfb098a1ab038791d51f91320380c13841df217e0f52f85334dff3404b851e71a7dff6ea7896e36a584f158d2a6042
diff --git a/dev-libs/wdns/wdns-0.10.0.ebuild b/dev-libs/wdns/wdns-0.10.0.ebuild
new file mode 120000
index 0000000..093ec52
--- /dev/null
+++ b/dev-libs/wdns/wdns-0.10.0.ebuild
@@ -0,0 +1 @@
+wdns-9999.ebuild
\ No newline at end of file
diff --git a/dev-libs/wdns/wdns-9999.ebuild b/dev-libs/wdns/wdns-9999.ebuild
index f004961..5798a28 100644
--- a/dev-libs/wdns/wdns-9999.ebuild
+++ b/dev-libs/wdns/wdns-9999.ebuild
@@ -1,40 +1,38 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=5
+EAPI=7
 
-inherit eutils autotools-utils
+inherit autotools
 
-if [[ ${PV} == "9999" ]] ; then
-    EGIT_REPO_URI="https://github.com/farsightsec/${PN}.git
-                   git://github.com/farsightsec/${PN}.git"
-    EGIT_MASTER="master"
-    inherit git-2
+MY_PN="github.com/farsightsec/${PN}"
+MY_P="${P}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${MY_PN}"
+	EGIT_SUBMODULES=()
+else
+	EGIT_COMMIT="v${PV}"
+	MY_P="${PN}-tags-${EGIT_COMMIT}"
+	SRC_URI="https://${MY_PN}/archive/tags/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="Low-level DNS library."
 HOMEPAGE="https://github.com/farsightsec/wdns"
 
 LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
+SLOT="0/${PVR}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 
 DEPEND="net-libs/libpcap:="
-
 RDEPEND="${DEPEND}"
 
-AUTOTOOLS_AUTORECONF=yes
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-    sed -i \
-        -e "/\$(AM_V_GEN)wdns\/gen_rrclass_to_str/s#wdns\/#${S}\/wdns\/#g" \
-        -e "/\$(AM_V_GEN)wdns\/gen_rrtype_to_str/s#wdns\/#${S}\/wdns\/#g" \
-        Makefile.am || die "sed failed"
-
-    ./autogen.sh || die
-}
+	default
 
-src_install() {
-    autotools-utils_src_install
+	eautoreconf
 }