[gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/files/, app-misc/fdutils/

2022-03-15 Thread Sam James 
commit: 9c554ecb727b2cdf544c4939e44761ad2320fa12
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 15 20:02:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 15 20:02:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c554ecb

app-misc/fdutils: drop 5.5.20060227-r1

Closes: https://bugs.gentoo.org/826430
Signed-off-by: Sam James  gentoo.org>

 app-misc/fdutils/Manifest  |  3 --
 app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild| 61 --
 .../files/fdutils-5.5-superformat-snprintf.patch   | 16 --
 .../fdutils/files/fdutils-5.5.20060227-gcc10.patch | 20 ---
 4 files changed, 100 deletions(-)

diff --git a/app-misc/fdutils/Manifest b/app-misc/fdutils/Manifest
index 5537fe0662b3..0b5b631657d0 100644
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@@ -1,5 +1,2 @@
-DIST fdutils-5.5-20060227_20081027.diff.gz 6748 BLAKE2B 
a6d9bf332a777c6c09c85ea85adfaf02422ed2e459d3cb5248c5f6c122e11d39c1a426288d8b611f61ee5ed33ceb5695644f6fbf5421e7a0b1b9937c6a3c26f3
 SHA512 
979ad8116a5e0c82584a534095e60689d3920d16f0685a184619012d4146f89d6dce063d896668242bf10a6372579ad16ee3e2093e386ff430f265a23458750d
-DIST fdutils_5.5-20060227-8.debian.tar.xz 48480 BLAKE2B 
16de5a3b9f634c3eafbe9048d84c6ff29933e5b5ad878de79e6b03aac49ec44334e7e8e090ad0518bc83e8adb91dd19612850f0de7e28bc9d9c10663fd9a5252
 SHA512 
a55823c2a4defe1ebad5a92c96a85766520a744b75f49e9f99eb14ec2c0ec44f91a72437d070942a4603f7e337ed60c380f61635b4aba57dbb5ddc8d771d8b89
-DIST fdutils_5.5-20060227.orig.tar.gz 222915 BLAKE2B 
d76a4b30ab60ea081e333817af11fe3815e8e19149c643afbcb931dc670fa3893cb96bb6be2136dea10fea06894a02e7fd1ecc4500ca6dd786054bbdaea19262
 SHA512 
a25d23827b9178a9a54d0012ad20248072e07aa5798bb3661fd0412d2441239b7bbf1778b5e34acb1a09a25a76e44c1801b706a242ce3b2337c06757e0ac02dd
 DIST fdutils_5.6-2.debian.tar.xz 49420 BLAKE2B 
6f21a07fc9eeea3588b5b810cfc0e20e8c9e3ba905caa4274643aceeb452cf62d9a8449d25f25d73f87933ed9fc1654fede129874218f497ea4dcba82fbb58cc
 SHA512 
b75d3b9185de51aae9ffc6e851b43b9722bb258b6d1c7517994a04bdf4607b53648291d0c755af2822d6503fe41150b08a56e59ccc4be604f23429cb10eb60b8
 DIST fdutils_5.6.orig.tar.gz 231851 BLAKE2B 
461a145f5cc698e110e699cebadd887283cc53eaa06fd06b35f34658696fa27fdd443012e26bfc29d26db5e8db15d664c91230f7c7c2d89439bcbc8ea649536f
 SHA512 
5b8c4b4f08657f7dd8bcbb5943df30386731c59be8fccd7da40504569c2fab48697d91937f0f50c19a51f84f2a191803139a93fafa10f8a3003cbd75faab

diff --git a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild 
b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
deleted file mode 100644
index 2c47d3562892..
--- a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch
-
-MY_P=${PN}_5.5-20060227
-
-DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
-HOMEPAGE="https://fdutils.linux.lu;
-SRC_URI="mirror://debian/pool/main/f/${PN}/${MY_P}.orig.tar.gz
-   mirror://debian/pool/main/f/${PN}/${MY_P}-8.debian.tar.xz
-   
https://dev.gentoo.org/~robbat2/distfiles/fdutils-5.5-20060227_20081027.diff.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND=">=sys-fs/mtools-4"
-DEPEND="${RDEPEND}
-   sys-apps/texinfo
-   virtual/os-headers
-   doc? ( virtual/texi2dvi )"
-
-S=${WORKDIR}/${PN}-5.5-20060227
-
-src_prepare() {
-   epatch "${FILESDIR}/${P}-gcc10.patch"
-
-   local d="${WORKDIR}"/debian/patches
-   EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
-   sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721
-   # The build sets up config.h and uses some symbols, but forgots to
-   # actually include it in most places.
-   sed -i '1i#include "../config.h"' src/*.c || die #580060
-   epatch "${FILESDIR}"/fdutils-5.5.20060227-r1-parallel.patch || die # 
315577
-   epatch "${DISTDIR}"/fdutils-5.5-20060227_20081027.diff.gz || die # 
upstream did make a patch-based release after 20060227!
-   epatch "${FILESDIR}"/fdutils-5.5-superformat-snprintf.patch || die # 
but it had a bug that strict GCC catches
-}
-
-src_configure() {
-   econf --enable-fdmount-floppy-only
-}
-
-src_compile() {
-   emake $(use doc || echo compile)
-}
-
-src_install() {
-   dodir /etc
-   use doc && dodir /usr/share/info
-
-   emake DESTDIR="${D}" install
-
-   # The copy in sys-apps/man-pages is more recent
-   rm -f "${ED}"/usr/share/man/man4/fd.4 || die
-
-   # Rename to match binary
-   mv "${ED}"/usr/share/man/man1/{makefloppies,MAKEFLOPPIES}.1 || die
-}

diff --git a/app-misc/fdutils/files/fdutils-5.5-superformat-snprintf.patch 
b/app-misc/fdutils/files/fdutils-5.5-superformat-snprintf.patch
deleted file mode 100644
index 49753478e5e6..
--- a/app-misc/fdutils/files/fdutils-5.5-superformat-snprintf.patch

[gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/, app-misc/fdutils/files/

2022-03-15 Thread Sam James 
commit: bd003ff3ac0a077118ab9e33783fd9e2408a4274
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Thu Mar 10 14:26:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 15 17:31:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd003ff3

app-misc/fdutils: Fix direct calls to "ar"

Closes: https://bugs.gentoo.org/834874
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Closes: https://github.com/gentoo/gentoo/pull/24477
Signed-off-by: Sam James  gentoo.org>

 app-misc/fdutils/fdutils-5.6_p2.ebuild |  2 ++
 .../fdutils/files/fdutils-5.6_p2-variable-ar.patch | 30 ++
 2 files changed, 32 insertions(+)

diff --git a/app-misc/fdutils/fdutils-5.6_p2.ebuild 
b/app-misc/fdutils/fdutils-5.6_p2.ebuild
index b49bc20f491a..715dea769e48 100644
--- a/app-misc/fdutils/fdutils-5.6_p2.ebuild
+++ b/app-misc/fdutils/fdutils-5.6_p2.ebuild
@@ -39,11 +39,13 @@ src_prepare() {
"${FILESDIR}"/fdutils-5.5.20060227-r1-parallel.patch # bug 
315577
"${FILESDIR}"/fdutils-5.6_p2-parallel.patch
"${FILESDIR}"/fdutils-5.6_p2-docs-build.patch
+   "${FILESDIR}"/fdutils-5.6_p2-variable-ar.patch
)
 
default
 
eautoreconf
+   touch ar-lib || die # bug 834874
 }
 
 src_configure() {

diff --git a/app-misc/fdutils/files/fdutils-5.6_p2-variable-ar.patch 
b/app-misc/fdutils/files/fdutils-5.6_p2-variable-ar.patch
new file mode 100644
index ..14a01ba20677
--- /dev/null
+++ b/app-misc/fdutils/files/fdutils-5.6_p2-variable-ar.patch
@@ -0,0 +1,30 @@
+Add variable for ${AR}
+--- a/configure.in
 b/configure.in
+@@ -6,6 +6,7 @@ AC_PROG_MAKE_SET
+ 
+ dnl Checks for compiler
+ AC_PROG_CC
++AM_PROG_AR
+ AC_PROG_GCC_TRADITIONAL
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+--- a/src/Makefile.in
 b/src/Makefile.in
+@@ -21,6 +21,7 @@ sysconfdir  = $(DESTDIR)@sysconfdir@
+ datarootdir = $(DESTDIR)@datarootdir@
+ 
+ CC   = @CC@
++AR   = @AR@
+ PID  = -DPIDFILE=\"@localstatedir@/run/diskseekd.pid\"
+ DEFINES  = $(DEFINES) $(PID) -DSYSCONFDIR=\"@sysconfdir@\"
+ DEFS = @DEFS@ -DSYSCONFDIR=\"@sysconfdir@\"
+@@ -69,7 +70,7 @@ lex.%.c: %.lex
+   lex -P$* $<
+ 
+ libfdutils.a: $(LIBFILES)
+-  ar rcs $@ $^
++  $(AR) rcs $@ $^
+ 
+ floppycontrol.o getfdprm setfdprm: /usr/include/linux/fd.h
+ diskseekd.o superformat.o fdrawcmd.o: /usr/include/linux/fd.h \

[gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/

2022-03-09 Thread Sam James 
commit: e4aba91f6c5657a7865a33ae77a90af9f5f0f69f
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar  9 23:22:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar  9 23:22:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4aba91f

app-misc/fdutils: restore dropped ppc/x86

Signed-off-by: Sam James  gentoo.org>

 app-misc/fdutils/fdutils-5.6_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/fdutils/fdutils-5.6_p2.ebuild 
b/app-misc/fdutils/fdutils-5.6_p2.ebuild
index 84a17c6b46a7..b49bc20f491a 100644
--- a/app-misc/fdutils/fdutils-5.6_p2.ebuild
+++ b/app-misc/fdutils/fdutils-5.6_p2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc"
 
 RDEPEND=">=sys-fs/mtools-4"

[gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/

2022-03-09 Thread Sam James 
commit: 02760b966cae98bb03927686828f48a8c74a8b6c
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar  9 14:51:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar  9 14:51:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02760b96

app-misc/fdutils: drop 5.5.20060227

Signed-off-by: Sam James  gentoo.org>

 app-misc/fdutils/Manifest|  1 -
 app-misc/fdutils/fdutils-5.5.20060227.ebuild | 57 
 2 files changed, 58 deletions(-)

diff --git a/app-misc/fdutils/Manifest b/app-misc/fdutils/Manifest
index d680a65c5d63..5537fe0662b3 100644
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@@ -1,5 +1,4 @@
 DIST fdutils-5.5-20060227_20081027.diff.gz 6748 BLAKE2B 
a6d9bf332a777c6c09c85ea85adfaf02422ed2e459d3cb5248c5f6c122e11d39c1a426288d8b611f61ee5ed33ceb5695644f6fbf5421e7a0b1b9937c6a3c26f3
 SHA512 
979ad8116a5e0c82584a534095e60689d3920d16f0685a184619012d4146f89d6dce063d896668242bf10a6372579ad16ee3e2093e386ff430f265a23458750d
-DIST fdutils_5.5-20060227-6.debian.tar.gz 54489 BLAKE2B 
4d0fbd1c9c4f115a9df3f7092e062173f6a8956df8d465bb0186f712f51f6ef9e4fc67c4c642cdf7ae7e9daa775d6657c4306f5837307a51daa0abcc12639b0e
 SHA512 
db6759bd2b98ae65bca39cf5b09fdb250371e02daa7665d8d21f93c3ab968cfe345cecb20faedaf2600104b22e2fb4df6868860dac3ead0ffb28d2141c8d7149
 DIST fdutils_5.5-20060227-8.debian.tar.xz 48480 BLAKE2B 
16de5a3b9f634c3eafbe9048d84c6ff29933e5b5ad878de79e6b03aac49ec44334e7e8e090ad0518bc83e8adb91dd19612850f0de7e28bc9d9c10663fd9a5252
 SHA512 
a55823c2a4defe1ebad5a92c96a85766520a744b75f49e9f99eb14ec2c0ec44f91a72437d070942a4603f7e337ed60c380f61635b4aba57dbb5ddc8d771d8b89
 DIST fdutils_5.5-20060227.orig.tar.gz 222915 BLAKE2B 
d76a4b30ab60ea081e333817af11fe3815e8e19149c643afbcb931dc670fa3893cb96bb6be2136dea10fea06894a02e7fd1ecc4500ca6dd786054bbdaea19262
 SHA512 
a25d23827b9178a9a54d0012ad20248072e07aa5798bb3661fd0412d2441239b7bbf1778b5e34acb1a09a25a76e44c1801b706a242ce3b2337c06757e0ac02dd
 DIST fdutils_5.6-2.debian.tar.xz 49420 BLAKE2B 
6f21a07fc9eeea3588b5b810cfc0e20e8c9e3ba905caa4274643aceeb452cf62d9a8449d25f25d73f87933ed9fc1654fede129874218f497ea4dcba82fbb58cc
 SHA512 
b75d3b9185de51aae9ffc6e851b43b9722bb258b6d1c7517994a04bdf4607b53648291d0c755af2822d6503fe41150b08a56e59ccc4be604f23429cb10eb60b8

diff --git a/app-misc/fdutils/fdutils-5.5.20060227.ebuild 
b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
deleted file mode 100644
index 2df9ab872a03..
--- a/app-misc/fdutils/fdutils-5.5.20060227.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch
-
-MY_P=${PN}_5.5-20060227
-
-DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
-HOMEPAGE="https://fdutils.linux.lu;
-SRC_URI="mirror://debian/pool/main/f/${PN}/${MY_P}.orig.tar.gz
-   mirror://debian/pool/main/f/${PN}/${MY_P}-6.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="doc"
-
-RDEPEND=">=sys-fs/mtools-4"
-DEPEND="${RDEPEND}
-   sys-apps/texinfo
-   virtual/os-headers
-   doc? ( virtual/texi2dvi )"
-
-S=${WORKDIR}/${PN}-5.5-20060227
-
-src_prepare() {
-   epatch "${FILESDIR}/${P}-gcc10.patch"
-
-   local d="${WORKDIR}"/debian/patches
-   EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
-   sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721
-   # The build sets up config.h and uses some symbols, but forgots to
-   # actually include it in most places.
-   sed -i '1i#include "../config.h"' src/*.c || die #580060
-}
-
-src_configure() {
-   econf --enable-fdmount-floppy-only
-}
-
-src_compile() {
-   emake -j1 $(use doc || echo compile)
-}
-
-src_install() {
-   dodir /etc
-   use doc && dodir /usr/share/info
-
-   emake -j1 DESTDIR="${D}" install
-
-   # The copy in sys-apps/man-pages is more recent
-   rm -f "${ED}"/usr/share/man/man4/fd.4 || die
-
-   # Rename to match binary
-   mv "${ED}"/usr/share/man/man1/{makefloppies,MAKEFLOPPIES}.1 || die
-}

[gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/

2022-03-09 Thread Sam James 
commit: b22e78b74a28d32882ed8f486ce7617228b7df47
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar  9 14:51:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar  9 14:51:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b22e78b7

app-misc/fdutils: add indirect toolchain-funcs

Signed-off-by: Sam James  gentoo.org>

 app-misc/fdutils/fdutils-5.6_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/fdutils/fdutils-5.6_p2.ebuild 
b/app-misc/fdutils/fdutils-5.6_p2.ebuild
index 4f48b92305df..84a17c6b46a7 100644
--- a/app-misc/fdutils/fdutils-5.6_p2.ebuild
+++ b/app-misc/fdutils/fdutils-5.6_p2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MY_P=${PN}_5.6
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Utilities for configuring and debugging the Linux floppy driver"
 HOMEPAGE="https://fdutils.linux.lu;

[gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/files/, app-misc/fdutils/

2022-03-09 Thread Sam James 
commit: d8c28af972c4fa3cb6a6df5a69e6a21d0ae92c88
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Wed Mar  2 21:46:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar  9 14:47:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8c28af9

app-misc/fdutils: New version (5.6_p2)

 * Bumps to EAPI=8

 * Most patching from previous version is no longer necessary (except
   for one)

 * Keeps all the Debian patches minus one

Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Closes: https://bugs.gentoo.org/826430
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/24393
Signed-off-by: Sam James  gentoo.org>

 app-misc/fdutils/Manifest  |  2 +
 app-misc/fdutils/fdutils-5.6_p2.ebuild | 64 ++
 .../fdutils/files/fdutils-5.6_p2-docs-build.patch  | 28 ++
 .../fdutils/files/fdutils-5.6_p2-parallel.patch| 26 +
 4 files changed, 120 insertions(+)

diff --git a/app-misc/fdutils/Manifest b/app-misc/fdutils/Manifest
index 94c7a9272116..d680a65c5d63 100644
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@@ -2,3 +2,5 @@ DIST fdutils-5.5-20060227_20081027.diff.gz 6748 BLAKE2B 
a6d9bf332a777c6c09c85ea8
 DIST fdutils_5.5-20060227-6.debian.tar.gz 54489 BLAKE2B 
4d0fbd1c9c4f115a9df3f7092e062173f6a8956df8d465bb0186f712f51f6ef9e4fc67c4c642cdf7ae7e9daa775d6657c4306f5837307a51daa0abcc12639b0e
 SHA512 
db6759bd2b98ae65bca39cf5b09fdb250371e02daa7665d8d21f93c3ab968cfe345cecb20faedaf2600104b22e2fb4df6868860dac3ead0ffb28d2141c8d7149
 DIST fdutils_5.5-20060227-8.debian.tar.xz 48480 BLAKE2B 
16de5a3b9f634c3eafbe9048d84c6ff29933e5b5ad878de79e6b03aac49ec44334e7e8e090ad0518bc83e8adb91dd19612850f0de7e28bc9d9c10663fd9a5252
 SHA512 
a55823c2a4defe1ebad5a92c96a85766520a744b75f49e9f99eb14ec2c0ec44f91a72437d070942a4603f7e337ed60c380f61635b4aba57dbb5ddc8d771d8b89
 DIST fdutils_5.5-20060227.orig.tar.gz 222915 BLAKE2B 
d76a4b30ab60ea081e333817af11fe3815e8e19149c643afbcb931dc670fa3893cb96bb6be2136dea10fea06894a02e7fd1ecc4500ca6dd786054bbdaea19262
 SHA512 
a25d23827b9178a9a54d0012ad20248072e07aa5798bb3661fd0412d2441239b7bbf1778b5e34acb1a09a25a76e44c1801b706a242ce3b2337c06757e0ac02dd
+DIST fdutils_5.6-2.debian.tar.xz 49420 BLAKE2B 
6f21a07fc9eeea3588b5b810cfc0e20e8c9e3ba905caa4274643aceeb452cf62d9a8449d25f25d73f87933ed9fc1654fede129874218f497ea4dcba82fbb58cc
 SHA512 
b75d3b9185de51aae9ffc6e851b43b9722bb258b6d1c7517994a04bdf4607b53648291d0c755af2822d6503fe41150b08a56e59ccc4be604f23429cb10eb60b8
+DIST fdutils_5.6.orig.tar.gz 231851 BLAKE2B 
461a145f5cc698e110e699cebadd887283cc53eaa06fd06b35f34658696fa27fdd443012e26bfc29d26db5e8db15d664c91230f7c7c2d89439bcbc8ea649536f
 SHA512 
5b8c4b4f08657f7dd8bcbb5943df30386731c59be8fccd7da40504569c2fab48697d91937f0f50c19a51f84f2a191803139a93fafa10f8a3003cbd75faab

diff --git a/app-misc/fdutils/fdutils-5.6_p2.ebuild 
b/app-misc/fdutils/fdutils-5.6_p2.ebuild
new file mode 100644
index ..4f40a982f956
--- /dev/null
+++ b/app-misc/fdutils/fdutils-5.6_p2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${PN}_5.6
+
+DESCRIPTION="Utilities for configuring and debugging the Linux floppy driver"
+HOMEPAGE="https://fdutils.linux.lu;
+SRC_URI="
+   mirror://debian/pool/main/f/${PN}/${MY_P}.orig.tar.gz
+   mirror://debian/pool/main/f/${PN}/${MY_P}-2.debian.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND=">=sys-fs/mtools-4"
+DEPEND="${RDEPEND}
+   virtual/os-headers
+"
+BDEPEND="
+   sys-apps/texinfo
+   doc? ( virtual/texi2dvi )
+"
+
+S="${WORKDIR}/${PN}-5.6"
+
+src_prepare() {
+   local debian=($(< "${WORKDIR}"/debian/patches/series)) || die
+   debian=(${debian[@]/fdmount-compilation_linux_2.6.patch/}) # exclude 
this patch
+   PATCHES+=("${debian[@]/#/${WORKDIR}/debian/patches/}")
+   PATCHES+=(
+   "${FILESDIR}"/fdutils-5.5.20060227-r1-parallel.patch # bug 
315577
+   "${FILESDIR}"/fdutils-5.6_p2-parallel.patch
+   "${FILESDIR}"/fdutils-5.6_p2-docs-build.patch
+   )
+   default
+}
+
+src_configure() {
+   econf --enable-fdmount-floppy-only
+}
+
+src_compile() {
+   emake
+   use doc && emake doc
+}
+
+src_install() {
+   dodir /etc
+   emake DESTDIR="${D}" install
+   emake -C doc DESTDIR="${D}" install-man
+
+   use doc && emake DESTDIR="${D}" install-doc
+
+   # The copy in sys-apps/man-pages is more recent
+   rm -f "${ED}"/usr/share/man/man4/fd.4 || die
+
+   # Rename to match binary
+   mv "${ED}"/usr/share/man/man1/{makefloppies,MAKEFLOPPIES}.1 || die
+}

diff --git a/app-misc/fdutils/files/fdutils-5.6_p2-docs-build.patch 
b/app-misc/fdutils/files/fdutils-5.6_p2-docs-build.patch
new file mode 100644
index ..bca3d58b5ed7
--- /dev/null
+++

[gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/files/, app-misc/fdutils/

2022-03-09 Thread Sam James 
commit: e441c9b10698c0eada30d02dc0353a18cd4bfaa1
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar  9 14:45:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar  9 14:47:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e441c9b1

app-misc/fdutils: fix docs patch

We want to detect / respect CC_FOR_BUILD.

Signed-off-by: Sam James  gentoo.org>

 app-misc/fdutils/fdutils-5.6_p2.ebuild |  8 +
 .../fdutils/files/fdutils-5.6_p2-docs-build.patch  | 37 +++---
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/app-misc/fdutils/fdutils-5.6_p2.ebuild 
b/app-misc/fdutils/fdutils-5.6_p2.ebuild
index 4f40a982f956..4f48b92305df 100644
--- a/app-misc/fdutils/fdutils-5.6_p2.ebuild
+++ b/app-misc/fdutils/fdutils-5.6_p2.ebuild
@@ -5,6 +5,8 @@ EAPI=8
 
 MY_P=${PN}_5.6
 
+inherit autotools
+
 DESCRIPTION="Utilities for configuring and debugging the Linux floppy driver"
 HOMEPAGE="https://fdutils.linux.lu;
 SRC_URI="
@@ -23,6 +25,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
sys-apps/texinfo
+   sys-devel/autoconf-archive
doc? ( virtual/texi2dvi )
 "
 
@@ -37,10 +40,15 @@ src_prepare() {
"${FILESDIR}"/fdutils-5.6_p2-parallel.patch
"${FILESDIR}"/fdutils-5.6_p2-docs-build.patch
)
+
default
+
+   eautoreconf
 }
 
 src_configure() {
+   export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
econf --enable-fdmount-floppy-only
 }
 

diff --git a/app-misc/fdutils/files/fdutils-5.6_p2-docs-build.patch 
b/app-misc/fdutils/files/fdutils-5.6_p2-docs-build.patch
index bca3d58b5ed7..5f0bfccd499c 100644
--- a/app-misc/fdutils/files/fdutils-5.6_p2-docs-build.patch
+++ b/app-misc/fdutils/files/fdutils-5.6_p2-docs-build.patch
@@ -1,28 +1,13 @@
-From 855e7727c06d6e61d0b1e3e34629de2cf0142a91 Mon Sep 17 00:00:00 2001
-From: Thomas Bracht Laumann Jespersen 
-Date: Wed, 2 Mar 2022 22:24:30 +0100
-Subject: [PATCH] doc: Replace CC_FOR_BUILD and EXEEXT_FOR_BUILD for building
- docs
-

- doc/Makefile.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index d94736f..d565359 100644
 a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -37,8 +37,8 @@ INSTALL_INFO= @INSTALL_INFO@
- CC  = @CC@
- CPPFLAGS= @CPPFLAGS@
- CFLAGS  = @CFLAGS@
--CC_FOR_BUILD = @CC_FOR_BUILD@
--EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
-+CC_FOR_BUILD = $(CC)
-+EXEEXT_FOR_BUILD =
+Use modern autoconf-archive macro to ensure @CC_FOR_BUILD@ and such gets
+replaced in Makefiles.
+--- a/configure.in
 b/configure.in
+@@ -9,7 +9,7 @@ AC_PROG_CC
+ AC_PROG_GCC_TRADITIONAL
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+-AX_CC_FOR_BUILD
++AX_PROG_CC_FOR_BUILD
  
- all: info dvi
+ AC_PATH_PROG(INSTALL_INFO, install-info, "")
  
--- 
-2.34.1
-

[gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/files/, app-misc/fdutils/

2021-01-01 Thread Andreas K. Hüttel 
commit: e47ebc6c160cad1de9f7484eabb0bd750d00d0e1
Author: Andreas K. Huettel  gentoo  org>
AuthorDate: Fri Jan  1 10:28:10 2021 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Fri Jan  1 10:28:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e47ebc6c

app-misc/fdutils: Fix build with gcc-10

Closes: https://bugs.gentoo.org/706822
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Huettel  gentoo.org>

 app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild  |  4 +++-
 app-misc/fdutils/fdutils-5.5.20060227.ebuild |  4 +++-
 .../fdutils/files/fdutils-5.5.20060227-gcc10.patch   | 20 
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild 
b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
index d234389a9e1..b0196c0d391 100644
--- a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
+++ b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-5.5-20060227
 
 src_prepare() {
+   epatch "${FILESDIR}/${P}-gcc10.patch"
+
local d="${WORKDIR}"/debian/patches
EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721

diff --git a/app-misc/fdutils/fdutils-5.5.20060227.ebuild 
b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
index 1116db851a7..632a26a8982 100644
--- a/app-misc/fdutils/fdutils-5.5.20060227.ebuild
+++ b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-5.5-20060227
 
 src_prepare() {
+   epatch "${FILESDIR}/${P}-gcc10.patch"
+
local d="${WORKDIR}"/debian/patches
EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721

diff --git a/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch 
b/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch
new file mode 100644
index 000..2bda41e1125
--- /dev/null
+++ b/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch
@@ -0,0 +1,20 @@
+Description: Fix ftbfs with GCC-10
+
+Author: Sudip Mukherjee 
+Bug-Debian: https://bugs.debian.org/957200
+Forwarded: no
+
+---
+
+--- fdutils-5.5-20060227.orig/src/superformat.h
 fdutils-5.5-20060227/src/superformat.h
+@@ -97,7 +97,7 @@ int compute_all_sequences(struct params
+ void compute_track0_sequence(struct params *fd);
+ int calc_skews(struct params *fd0, struct params *fd, int n);
+ extern int verbosity;
+-int header_size;
+-int index_size;
++extern int header_size;
++extern int index_size;
+ 
+ #endif

[gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/, app-misc/fdutils/files/

2019-03-17 Thread Robin H. Johnson 
commit: f968770c9455c55d321ce58b5c850c4491ed9eca
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Mar 17 22:35:36 2019 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Mar 17 22:37:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f968770c

app-misc/fdutils: fix parallel compile & add 20081027 patch

Fix parallel compile .a target, and add upstream's 20081027 patch that
was missed otherwise, as well as a compile-fix for the 20081027 patch.

Add myself as maintainer, because I've used this in the past, and used
to be one of the kernel-misc maintainers.

Fixes: https://bugs.gentoo.org/315577
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Robin H. Johnson  gentoo.org>

 app-misc/fdutils/Manifest  |  2 +
 app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild| 59 ++
 .../files/fdutils-5.5-superformat-snprintf.patch   | 16 ++
 .../files/fdutils-5.5.20060227-r1-parallel.patch   | 18 +++
 app-misc/fdutils/metadata.xml  |  5 +-
 5 files changed, 99 insertions(+), 1 deletion(-)

diff --git a/app-misc/fdutils/Manifest b/app-misc/fdutils/Manifest
index aaeb31b898f..94c7a927211 100644
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@@ -1,2 +1,4 @@
+DIST fdutils-5.5-20060227_20081027.diff.gz 6748 BLAKE2B 
a6d9bf332a777c6c09c85ea85adfaf02422ed2e459d3cb5248c5f6c122e11d39c1a426288d8b611f61ee5ed33ceb5695644f6fbf5421e7a0b1b9937c6a3c26f3
 SHA512 
979ad8116a5e0c82584a534095e60689d3920d16f0685a184619012d4146f89d6dce063d896668242bf10a6372579ad16ee3e2093e386ff430f265a23458750d
 DIST fdutils_5.5-20060227-6.debian.tar.gz 54489 BLAKE2B 
4d0fbd1c9c4f115a9df3f7092e062173f6a8956df8d465bb0186f712f51f6ef9e4fc67c4c642cdf7ae7e9daa775d6657c4306f5837307a51daa0abcc12639b0e
 SHA512 
db6759bd2b98ae65bca39cf5b09fdb250371e02daa7665d8d21f93c3ab968cfe345cecb20faedaf2600104b22e2fb4df6868860dac3ead0ffb28d2141c8d7149
+DIST fdutils_5.5-20060227-8.debian.tar.xz 48480 BLAKE2B 
16de5a3b9f634c3eafbe9048d84c6ff29933e5b5ad878de79e6b03aac49ec44334e7e8e090ad0518bc83e8adb91dd19612850f0de7e28bc9d9c10663fd9a5252
 SHA512 
a55823c2a4defe1ebad5a92c96a85766520a744b75f49e9f99eb14ec2c0ec44f91a72437d070942a4603f7e337ed60c380f61635b4aba57dbb5ddc8d771d8b89
 DIST fdutils_5.5-20060227.orig.tar.gz 222915 BLAKE2B 
d76a4b30ab60ea081e333817af11fe3815e8e19149c643afbcb931dc670fa3893cb96bb6be2136dea10fea06894a02e7fd1ecc4500ca6dd786054bbdaea19262
 SHA512 
a25d23827b9178a9a54d0012ad20248072e07aa5798bb3661fd0412d2441239b7bbf1778b5e34acb1a09a25a76e44c1801b706a242ce3b2337c06757e0ac02dd

diff --git a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild 
b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
new file mode 100644
index 000..d234389a9e1
--- /dev/null
+++ b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+MY_P=${PN}_5.5-20060227
+
+DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
+HOMEPAGE="https://fdutils.linux.lu;
+SRC_URI="mirror://debian/pool/main/f/${PN}/${MY_P}.orig.tar.gz
+   mirror://debian/pool/main/f/${PN}/${MY_P}-8.debian.tar.xz
+   
https://dev.gentoo.org/~robbat2/distfiles/fdutils-5.5-20060227_20081027.diff.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND=">=sys-fs/mtools-4"
+DEPEND="${RDEPEND}
+   sys-apps/texinfo
+   virtual/os-headers
+   doc? ( virtual/texi2dvi )"
+
+S=${WORKDIR}/${PN}-5.5-20060227
+
+src_prepare() {
+   local d="${WORKDIR}"/debian/patches
+   EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
+   sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721
+   # The build sets up config.h and uses some symbols, but forgots to
+   # actually include it in most places.
+   sed -i '1i#include "../config.h"' src/*.c || die #580060
+   epatch "${FILESDIR}"/fdutils-5.5.20060227-r1-parallel.patch || die # 
315577
+   epatch "${DISTDIR}"/fdutils-5.5-20060227_20081027.diff.gz || die # 
upstream did make a patch-based release after 20060227!
+   epatch "${FILESDIR}"/fdutils-5.5-superformat-snprintf.patch || die # 
but it had a bug that strict GCC catches
+}
+
+src_configure() {
+   econf --enable-fdmount-floppy-only
+}
+
+src_compile() {
+   emake $(use doc || echo compile)
+}
+
+src_install() {
+   dodir /etc
+   use doc && dodir /usr/share/info
+
+   emake DESTDIR="${D}" install
+
+   # The copy in sys-apps/man-pages is more recent
+   rm -f "${ED}"/usr/share/man/man4/fd.4 || die
+
+   # Rename to match binary
+   mv "${ED}"/usr/share/man/man1/{makefloppies,MAKEFLOPPIES}.1 || die
+}

diff --git a/app-misc/fdutils/files/fdutils-5.5-superformat-snprintf.patch 
b/app-misc/fdutils/files/fdutils-5.5-superformat-snprintf.patch
new file mode 100644
index 000..49753478e5e
--- /dev/null

[gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/files/, app-misc/fdutils/

2017-08-17 Thread Amy Liffey 
commit: 37ba12137f7a43793484a2374d95653adcff00f8
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Aug 17 14:22:25 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Aug 17 14:25:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37ba1213

app-misc/fdutils: remove old

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-misc/fdutils/Manifest  |  2 -
 app-misc/fdutils/fdutils-5.4.20020222-r1.ebuild| 48 --
 .../fdutils/files/fdutils-no-fd.4-manpage.diff | 12 --
 3 files changed, 62 deletions(-)

diff --git a/app-misc/fdutils/Manifest b/app-misc/fdutils/Manifest
index d192b05c5d4..4098039d002 100644
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@@ -1,4 +1,2 @@
-DIST fdutils-5.4-20020222.diff.gz 25310 SHA256 
259c340a5956272e60385d0b8ae0a04b3d2ae0fc395114672536cba5f50bf903 SHA512 
069583e796f86266e486ad65009d6a8163fc56b59f957f34ab144cc25188b868c950a48e2fd25fc876cd5b1fa3faa40bdc4c16e4690fe3a2a47f933f85e31094
 WHIRLPOOL 
9b679a1a0b7254a1d72de083c3ae3fa9c329234c6da6138ad08649cde8fbff002e31ba8f0d4de504c3a98404a88ab23a3dc76a60b51599ee18af786f157e2d12
-DIST fdutils-5.4.tar.gz 190535 SHA256 
20ebb4fa9ec74e669eb0377819fafbf177325e930906032649aa8344bb34b9e9 SHA512 
3c2dde9d2e14f771f6916851827df5b2dde62e3522b6ceb411bf0772800a4d8ed4721d99ad170b81de0cc8dba41a60817232993f3d69eb07141e1929ac626570
 WHIRLPOOL 
20626366bc1ad4334184de97c8ef43d50a00496be80f298a59eeb1144f493750cea61a39cc43ff8d251794854ec0a635141bc39d43cba9fad36c411bd0710da2
 DIST fdutils_5.5-20060227-6.debian.tar.gz 54489 SHA256 
51fae03acb4f087b09c076dc3ec4e7b31362f1e1a9fa7b2b17d6dade1cd512fb SHA512 
db6759bd2b98ae65bca39cf5b09fdb250371e02daa7665d8d21f93c3ab968cfe345cecb20faedaf2600104b22e2fb4df6868860dac3ead0ffb28d2141c8d7149
 WHIRLPOOL 
f34a8d5d98a5b89544270dad4c3198881062aef7bec99e2dbfc186bfeab2e24f5ac741b487fac8136d7bddce907527645116d26d21f5f1af9e6d4f6c581196e8
 DIST fdutils_5.5-20060227.orig.tar.gz 222915 SHA256 
a867b381adc3596ca9a0c9139773bef18a38ceb5fa0e7401af46813c3a4b8d58 SHA512 
a25d23827b9178a9a54d0012ad20248072e07aa5798bb3661fd0412d2441239b7bbf1778b5e34acb1a09a25a76e44c1801b706a242ce3b2337c06757e0ac02dd
 WHIRLPOOL 
4baa17276258669d950a0b3199db23521ebcd63ebe069f9ad94ec1903dd62e142314ad411c6d40a7323f5cc4869f3fab147ca3eb930f4ae0c7dcaaea3362c442

diff --git a/app-misc/fdutils/fdutils-5.4.20020222-r1.ebuild 
b/app-misc/fdutils/fdutils-5.4.20020222-r1.ebuild
deleted file mode 100644
index b231f46dc63..000
--- a/app-misc/fdutils/fdutils-5.4.20020222-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-S=${WORKDIR}/${PN}-5.4
-DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
-HOMEPAGE="http://fdutils.linux.lu/;
-SRC_URI="http://fdutils.linux.lu/${PN}-5.4.tar.gz
-http://fdutils.linux.lu/${PN}-5.4-20020222.diff.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="doc"
-
-DEPEND=">=sys-fs/mtools-3
-   doc? ( virtual/texi2dvi )"
-
-src_unpack() {
-   unpack ${A}
-   epatch "${WORKDIR}/${PN}-5.4-20020222.diff"
-
-   # the man 4 fd manpage is better in the man-pages package, so stop it
-   # from installing
-   epatch "${FILESDIR}/${PN}-no-fd.4-manpage.diff"
-}
-
-src_compile() {
-   econf --enable-fdmount-floppy-only || die
-
-   if use doc
-   then
-   make || die
-   else
-   make compile || die
-   fi
-}
-
-src_install() {
-   dodir /usr/bin /usr/share/man/man1
-
-   einstall || die
-
-   insinto /etc
-   doins src/mediaprm
-   dodoc Changelog
-}

diff --git a/app-misc/fdutils/files/fdutils-no-fd.4-manpage.diff 
b/app-misc/fdutils/files/fdutils-no-fd.4-manpage.diff
deleted file mode 100644
index 909ecd971da..000
--- a/app-misc/fdutils/files/fdutils-no-fd.4-manpage.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN fdutils-5.4.old/doc/Makefile.in fdutils-5.4/doc/Makefile.in
 fdutils-5.4.old/doc/Makefile.in1999-07-02 15:03:25.0 -0700
-+++ fdutils-5.4/doc/Makefile.in2003-12-10 00:24:36.0 -0800
-@@ -22,7 +22,7 @@
-floppycontrol.1 makefloppies.1 xdfcopy.1 fdmount.1 \
-floppymeter.1 setfdprm.1
- 
--MANPAGES4   = fd.4
-+MANPAGES4   =
- MANPERM = 644
- UID = root
- GID = root

[gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/

2017-08-17 Thread Amy Liffey 
commit: 908db8fd8e7c42449c7861cc7e3e67149b4e52f0
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Aug 17 14:16:47 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Aug 17 14:25:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=908db8fd

app-misc/fdutils: stable for x86

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-misc/fdutils/fdutils-5.5.20060227.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-misc/fdutils/fdutils-5.5.20060227.ebuild 
b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
index 6cda0ffb440..4583e0b166a 100644
--- a/app-misc/fdutils/fdutils-5.5.20060227.ebuild
+++ b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/f/${PN}/${MY_P}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="doc"
 
 RDEPEND=">=sys-fs/mtools-4"

[gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/, app-misc/fdutils/files/

2017-08-17 Thread Amy Liffey 
commit: e119246f39378df15dfe1ddda680080bdc9b38a4
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Aug 17 14:01:41 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Aug 17 14:05:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e119246f

app-misc/fdutils: rm old deprecated eapi

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-misc/fdutils/Manifest  |   1 -
 app-misc/fdutils/fdutils-5.5-r2.ebuild |  41 --
 .../fdutils/files/fdutils-5.5-destdirfix.patch | 140 -
 3 files changed, 182 deletions(-)

diff --git a/app-misc/fdutils/Manifest b/app-misc/fdutils/Manifest
index 7c083712c10..d192b05c5d4 100644
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@@ -1,5 +1,4 @@
 DIST fdutils-5.4-20020222.diff.gz 25310 SHA256 
259c340a5956272e60385d0b8ae0a04b3d2ae0fc395114672536cba5f50bf903 SHA512 
069583e796f86266e486ad65009d6a8163fc56b59f957f34ab144cc25188b868c950a48e2fd25fc876cd5b1fa3faa40bdc4c16e4690fe3a2a47f933f85e31094
 WHIRLPOOL 
9b679a1a0b7254a1d72de083c3ae3fa9c329234c6da6138ad08649cde8fbff002e31ba8f0d4de504c3a98404a88ab23a3dc76a60b51599ee18af786f157e2d12
 DIST fdutils-5.4.tar.gz 190535 SHA256 
20ebb4fa9ec74e669eb0377819fafbf177325e930906032649aa8344bb34b9e9 SHA512 
3c2dde9d2e14f771f6916851827df5b2dde62e3522b6ceb411bf0772800a4d8ed4721d99ad170b81de0cc8dba41a60817232993f3d69eb07141e1929ac626570
 WHIRLPOOL 
20626366bc1ad4334184de97c8ef43d50a00496be80f298a59eeb1144f493750cea61a39cc43ff8d251794854ec0a635141bc39d43cba9fad36c411bd0710da2
-DIST fdutils-5.5.tar.gz 222801 SHA256 
87d5bbe8094558463acc5902664c58afd794322b0ea3ab3c2ed7b362c583a48a SHA512 
c9eab0b8931bbd11fcacfeff54c87059844b068595725abb00c7c605cba0bdc7c9abcd31d0a0186786306a9136eac2ec3bad43842f0383acdb162ccbb39a73b8
 WHIRLPOOL 
622ded0b8f56257f42fdb7ab7ce648a3d813882c2b05ab30cc36c1b447b66e8c51757ce972b43ffd65d7929be7b7aed72ff3fe235c8fa47a263739ae1daace14
 DIST fdutils_5.5-20060227-6.debian.tar.gz 54489 SHA256 
51fae03acb4f087b09c076dc3ec4e7b31362f1e1a9fa7b2b17d6dade1cd512fb SHA512 
db6759bd2b98ae65bca39cf5b09fdb250371e02daa7665d8d21f93c3ab968cfe345cecb20faedaf2600104b22e2fb4df6868860dac3ead0ffb28d2141c8d7149
 WHIRLPOOL 
f34a8d5d98a5b89544270dad4c3198881062aef7bec99e2dbfc186bfeab2e24f5ac741b487fac8136d7bddce907527645116d26d21f5f1af9e6d4f6c581196e8
 DIST fdutils_5.5-20060227.orig.tar.gz 222915 SHA256 
a867b381adc3596ca9a0c9139773bef18a38ceb5fa0e7401af46813c3a4b8d58 SHA512 
a25d23827b9178a9a54d0012ad20248072e07aa5798bb3661fd0412d2441239b7bbf1778b5e34acb1a09a25a76e44c1801b706a242ce3b2337c06757e0ac02dd
 WHIRLPOOL 
4baa17276258669d950a0b3199db23521ebcd63ebe069f9ad94ec1903dd62e142314ad411c6d40a7323f5cc4869f3fab147ca3eb930f4ae0c7dcaaea3362c442

diff --git a/app-misc/fdutils/fdutils-5.5-r2.ebuild 
b/app-misc/fdutils/fdutils-5.5-r2.ebuild
deleted file mode 100644
index 69e2df6f677..000
--- a/app-misc/fdutils/fdutils-5.5-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
-HOMEPAGE="http://fdutils.linux.lu/;
-SRC_URI="http://fdutils.linux.lu/${P}.tar.gz;
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="doc"
-
-RDEPEND=">=sys-fs/mtools-3"
-
-DEPEND="${RDEPEND}
-   doc? ( virtual/texi2dvi )"
-
-src_unpack() {
-   unpack ${A}
-   cd "${S}"
-   # the man 4 fd manpage is better in the man-pages package, so stop it
-   # from installing
-   epatch "${FILESDIR}/${PN}-no-fd.4-manpage.diff"
-   epatch "${FILESDIR}/${P}-destdirfix.patch"
-   sed -i -e '/\$(INSTALL) -c/s/ -s / /' src/Makefile.in || die "Failed to 
sed upstream src/Makefile.in to prevent premature strip"
-}
-
-src_compile() {
-   econf --enable-fdmount-floppy-only || die
-
-   # parallel make unsafe (bug#315577)
-   emake -j1 $(use doc || echo compile) || die "emake failed"
-}
-
-src_install() {
-   dodoc Changelog
-   use doc && dodir /usr/share/info/
-   dodir /etc
-   emake -j1 DESTDIR="${D}" install || die
-}

diff --git a/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch 
b/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch
deleted file mode 100644
index 47d1918b1f4..000
--- a/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch
+++ /dev/null
@@ -1,140 +0,0 @@
 fdutils-5.5/doc/Makefile.in.orig   2005-07-16 19:54:56.0 +1000
-+++ fdutils-5.5/doc/Makefile.in2005-07-16 20:00:42.0 +1000
-@@ -79,68 +79,68 @@
- 
- # Don't cd, to avoid breaking install-sh references.
- install-info: info
--  $(top_srcdir)/mkinstalldirs $(infodir)
-+  $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
-   if test -f fdutils.info; then \
- for i in fdutils.info*; do \
--  $(INSTALL_DATA) $$i $(infodir)/$$i; \
-+  $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \

[gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/

2016-04-19 Thread Mike Frysinger 
commit: 8b3fef2e5ea54c3390306e545453abf97d38e7d6
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Apr 19 06:42:14 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Apr 19 06:42:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b3fef2e

app-misc/fdutils: fix build w/newer glibc #580060

 app-misc/fdutils/fdutils-5.5.20060227.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-misc/fdutils/fdutils-5.5.20060227.ebuild 
b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
index 3658976..46c70f7 100644
--- a/app-misc/fdutils/fdutils-5.5.20060227.ebuild
+++ b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
@@ -29,6 +29,9 @@ src_prepare() {
local d="${WORKDIR}"/debian/patches
EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721
+   # The build sets up config.h and uses some symbols, but forgots to
+   # actually include it in most places.
+   sed -i '1i#include "../config.h"' src/*.c || die #580060
 }
 
 src_configure() {