gentoo resync : 03.11.2019

3 files changed, 47 insertions, 42 deletions

diff --git a/dev-libs/libatasmart/Manifest b/dev-libs/libatasmart/Manifest
index f95176c51889..5ba5788746d7 100644
--- a/dev-libs/libatasmart/Manifest
+++ b/dev-libs/libatasmart/Manifest
@@ -1,5 +1,7 @@
 DIST libatasmart-0.19.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62
 DIST libatasmart_0.19-2.debian.tar.gz 6511 BLAKE2B d283dd1db988b95436a99cf804790b6c9b22d48b41d561a6fd2b9aff0948241ab5e775c5c35691692103acd5e73ad2e46278b9d37f886cd48c91cc69353a1564 SHA512 78e86b0c1d2a56dddc8d9ac97ee325871e319ad2226f1fbd5a048d792cd05e5d8162d282c1f767086da5329cd1ee67b37fbb5a2fd3c950f84e9efab11abcf754
-EBUILD libatasmart-0.19-r1.ebuild 947 BLAKE2B 073735d386281eed2d06473756dc5c2320c630f682c5896961fead7384c9b015fe998d18fc10481f3989ad28fcdc34efb0f2d4b6f7dc0da1b18e75debfcb0d98 SHA512 9f01383cfd7db79cfa99d76f9a8b8c6fd2eb91d329c1b99ef32103c107fe731286b6103fa4748e304787ef16ff41e10d16db2b29788966b1854a19e7f6e478b0
+DIST libatasmart_0.19-5.debian.tar.xz 6452 BLAKE2B 09bde3d5d79062d4df82e5582e932b6b566a91607086ddd805925d1966cdee4cb4ba43863f4b7d26a98588479b117841050f762d23c6719448635bf1e681b315 SHA512 434b6ef3ea377485ce745e147da8bb72851b2eeabe6f418379511650f0161f15a9ee21f4f0b5f9beb218b99eb417c1aeafdea4640995efbaf45024f40ce71802
+DIST libatasmart_0.19.orig.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62
 EBUILD libatasmart-0.19-r2.ebuild 962 BLAKE2B ee87912f6b870e8ccb660802d46708d171bc057ec404c04f814483feec58e6cd65c0afe358e52a5868a5331ee25989523579b17b6dae814655066b560739d8f1 SHA512 d6ea6bd3d6982e89fde7189312757e1bafef524f8ee8e69074291a01f35005d53d433454a289a635debc723be4fd1a1e071269cf9d41148c6afbb759c5e3c304
+EBUILD libatasmart-0.19_p5.ebuild 1055 BLAKE2B 161c4bb23868cb06ead1dd68bc7f66a43d78a660135895f859e1a0f15c1f43494a0e05706c110f82e94dbe3ae5a4251055dfb061eba4301be706ed029b185199 SHA512 1620ca2a89aed751ddc6660c3da2e07fbac6c49bccee4292eb3a3417205c016e77d90cfbaef6609269611e4ff2fbc30b5d1c55876ee779e2bfd59a84785f762c
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/dev-libs/libatasmart/libatasmart-0.19-r1.ebuild b/dev-libs/libatasmart/libatasmart-0.19-r1.ebuild
deleted file mode 100644
index f2820bf64e2b..000000000000
--- a/dev-libs/libatasmart/libatasmart-0.19-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-PATCH_LEVEL=2
-
-DESCRIPTION="A small and lightweight parser library for ATA S.M.A.R.T. hard disks"
-HOMEPAGE="http://0pointer.de/blog/projects/being-smart.html"
-SRC_URI="http://0pointer.de/public/${P}.tar.xz
-	mirror://debian/pool/main/liba/${PN}/${PN}_${PV}-${PATCH_LEVEL}.debian.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="static-libs"
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="README"
-
-src_prepare() {
-	# https://bugs.gentoo.org/470874
-	local d="${WORKDIR}"/debian/patches
-	sed -i -e '/#/d' "${d}"/series || die
-	EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
new file mode 100644
index 000000000000..14cb1e0f3a06
--- /dev/null
+++ b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A small and lightweight parser library for ATA S.M.A.R.T. hard disks"
+HOMEPAGE="https://salsa.debian.org/utopia-team/libatasmart"
+SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p*}.orig.tar.xz
+	mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND="virtual/libudev:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_p*}"
+
+src_prepare() {
+	# https://bugs.gentoo.org/470874
+	local d="${WORKDIR}/debian/patches"
+	sed -i -e '/#/d' \
+		-e "s|^|${d}/|" "${d}"/series || die
+	eapply $(<"${d}"/series)
+	eapply_user
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}