gentoo resync : 13.10.2019

4 files changed, 50 insertions, 52 deletions

diff --git a/sys-fs/diskdev_cmds/Manifest b/sys-fs/diskdev_cmds/Manifest
index 714448b975d9..330c96093716 100644
--- a/sys-fs/diskdev_cmds/Manifest
+++ b/sys-fs/diskdev_cmds/Manifest
@@ -1,5 +1,5 @@
-AUX diskdev_cmds-respect-cflags.patch 384 BLAKE2B c4fb56e72868554f8f90841f00a88d4b234ca18b46b9b18f34bcf4b4cf346f97a9c918c975b64753ad97c915c78d5c94329b71e83089856f7b36696fd85d3dca SHA512 db60e9cd8a87fb048f1a97605c578701319c09a370774a7f41cea6d43ded38636796461456a4e1fccac3511f700de9770fb6a4beb7c85e463f23c37f1e3e7afb
+AUX diskdev_cmds-respect-cflags.patch 388 BLAKE2B 8ecaa932e3a5841bc9ace0ffd2fea2f974a42ad33f0f65551bcc4c2a873b50a4413cf16542b74f277244f578142fcd5f1bfe63063c280062bf06aed20f601385 SHA512 21325ea43ea19a06962b7123ba418d5759d712d44b1ba7d35fa982613a95d2d91d1e7cde287b497d9e6de9483658f36378f7d3d03e5780d7dc468a82e5b0da69
 DIST diskdev_cmds-332.14.tar.gz 714035 BLAKE2B 8c66509366db8067b6b3057dc8dd8c6de5f25df86a88fec8beac78e4e14d91af5319bf61671ceea206508b6abac54231e82d527a2cc79ea467e7660e10997a7f SHA512 e1df91fb5330dc01a79de99dd8b1f389a337a19c2136994d59b7cbca9c2e1cb5f7d47101366dd01db4e23a5d3d7afab41758045bf7402d739fa22182dc922044
 DIST diskdev_cmds-332.14_p1.patch.bz2 21989 BLAKE2B f7e421c164ec242e6516a4638bc4c4706a11b03587fad0e7328a311d15f47b48b4e706f819cffa8e8539d7e4eaa8efa5f9a55a838f88586872e7fc8d67c9ac8e SHA512 aaef096aa6a3f2e09bcc8c1831172c3d68994589ade505153ade00e6f4d0c49263b63212f8616ece597b1ee218a87474bb1c3812d15f34c5bc5c51fd7b72a062
-EBUILD diskdev_cmds-332.14_p1.ebuild 1650 BLAKE2B 656d0113e879dfd464fe58987b6fc3ace7d87d9d6d532990af3ff14bdf83bdce57c8dffda0affd0644b72aeec7d4a3201f10e1e7037b9bc912aadc072b3c79be SHA512 64e14df1fe20e00bcd161fca6ab99567236387bb4ab4f21469d8673569471c665f890a326f5c1bdf76c888ea8d27872ce4c407dcad6e2af20fabaf22c8305437
+EBUILD diskdev_cmds-332.14_p1-r1.ebuild 1232 BLAKE2B 9dcd240a0197878200d438b856d2eb6514a28597c6f8ad505a9aafcc8669e97373d92135c263dd43aad032886af52f694d0539f52d145be9a5a2d871e1dda7d6 SHA512 c243627cf30cc6ae1462ad8ed544ba933439ed14246f8fe23fbc0c1ea901f57107e7fc59284e5906384bab29d62eb994c27f6336b2e71a8517c450e0ed3c6f3b
 MISC metadata.xml 390 BLAKE2B e64b93c1e1bc559fd8ee2b08df7760111f5e6a16ba5da382a8544fc30f619235b1faf36f3dc34af6db04d55a8e55b8898c5c11648d7f08a0aa2d084fe936a539 SHA512 713593a494fe0722fc1ea9984450a392585e57d2e317d99bbac73a2f713ff87950d52b11124ce2f3c7536755302c364d94ca38389b93789d3af5f5d19d8fc0fa
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r1.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r1.ebuild
new file mode 100644
index 000000000000..8df958e56038
--- /dev/null
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV=${PV%_p*}
+
+DESCRIPTION="HFS and HFS+ utils ported from OSX, supplies mkfs and fsck"
+HOMEPAGE="http://opendarwin.org"
+SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.tar.gz
+		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
+LICENSE="APSL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
+IUSE=""
+DEPEND="dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+	"${WORKDIR}"/diskdev_cmds-${PV}.patch
+	"${FILESDIR}"/diskdev_cmds-respect-cflags.patch
+)
+
+src_compile() {
+	emake -f Makefile.lnx AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+src_install() {
+	into /
+	dosbin fsck_hfs.tproj/fsck_hfs
+	dosbin newfs_hfs.tproj/newfs_hfs
+	dosym /sbin/newfs_hfs /sbin/mkfs.hfs
+	dosym /sbin/newfs_hfs /sbin/mkfs.hfsplus
+	dosym /sbin/fsck_hfs /sbin/fsck.hfs
+	dosym /sbin/fsck_hfs /sbin/fsck.hfsplus
+	doman newfs_hfs.tproj/newfs_hfs.8
+	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfs.8
+	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfsplus.8
+	doman fsck_hfs.tproj/fsck_hfs.8
+	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfs.8
+	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfsplus.8
+}
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1.ebuild
deleted file mode 100644
index 6b608a1b6315..000000000000
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_PV=${PV%_p*}
-
-DESCRIPTION="HFS and HFS+ utils ported from OSX, supplies mkfs and fsck"
-HOMEPAGE="http://opendarwin.org"
-SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.tar.gz
-		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
-LICENSE="APSL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE=""
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/diskdev_cmds-${PV}.patch
-	epatch "${FILESDIR}"/diskdev_cmds-respect-cflags.patch
-}
-
-src_compile() {
-	emake -f Makefile.lnx || die "emake failed"
-}
-
-src_install() {
-	into /
-	dosbin fsck_hfs.tproj/fsck_hfs || die "dosbin fsck failed"
-	dosbin newfs_hfs.tproj/newfs_hfs || die "dosbin newfs failed"
-	dosym /sbin/newfs_hfs /sbin/mkfs.hfs || die "dosym mkfs.hfs failed"
-	dosym /sbin/newfs_hfs /sbin/mkfs.hfsplus || die "dosym mkfs.hfsplus failed"
-	dosym /sbin/fsck_hfs /sbin/fsck.hfs || die "dosym fsck.hfs failed"
-	dosym /sbin/fsck_hfs /sbin/fsck.hfsplus || die "dosym fsck.hfsplus failed"
-	doman newfs_hfs.tproj/newfs_hfs.8 || die "doman newfs_hfs.8 failed"
-	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfs.8 || die "doman mkfs.hfs.8 failed"
-	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfsplus.8 || die "doman mkfs.hfsplus.8 failed"
-	doman fsck_hfs.tproj/fsck_hfs.8 || die "doman fsck_hfs.8 failed"
-	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfs.8 || die "doman fsck.hfs.8 failed"
-	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfsplus.8 || die "doman fsck.hfsplus.8 failed"
-}
diff --git a/sys-fs/diskdev_cmds/files/diskdev_cmds-respect-cflags.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-respect-cflags.patch
index 3f939f61163a..8acafce6c913 100644
--- a/sys-fs/diskdev_cmds/files/diskdev_cmds-respect-cflags.patch
+++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-respect-cflags.patch
@@ -1,5 +1,5 @@
---- Makefile.lnx.bak	2009-07-22 11:58:10.000000000 -0400
-+++ Makefile.lnx	2009-07-22 11:57:37.000000000 -0400
+--- a/Makefile.lnx.bak	2009-07-22 11:58:10.000000000 -0400
++++ b/Makefile.lnx	2009-07-22 11:57:37.000000000 -0400
 @@ -1,5 +1,5 @@
  CC := gcc
 -CFLAGS := -g3 -Wall -I$(PWD)/include -DDEBUG_BUILD=0 -D_FILE_OFFSET_BITS=64 -D LINUX=1 -D BSD=1