5 files changed, 22 insertions, 47 deletions
diff --git a/app-emulation/libdsk/Manifest b/app-emulation/libdsk/Manifest
index 948efc2aaff9..085523245587 100644
--- a/app-emulation/libdsk/Manifest
+++ b/app-emulation/libdsk/Manifest
@@ -1 +1 @@
-DIST libdsk-1.5.8.tar.gz 1212684 BLAKE2B 52a2687d8ade0378096215d362df21b6eb477b3304910bb98c56264fb05bec6ad2d2b7254dd132fe50e60d5179b4875a1a91088f8ed93f68886054bf1df060f4 SHA512 6bb332dcd58b88272130a950ed686852f66a1e97030aaa280db3bc65a7f82513d57055c2cc3e653e1e06843c453e46a52ce280b45b42c0bb671d1e0f6d7c9520
+DIST libdsk-1.5.18.tar.gz 1295474 BLAKE2B 36dd2a0c5a53899b721dc46848c79a36b80ebb30d8210eacf7462d5785c607f00b69ca26ea4ec35bd3e03f5203043e6aa0687b2212672b274305e9f5aad8ce6e SHA512 5d845084f6c7791813be7c2afcd34a52cebb217ddcdafe1953fcbd55ce5b7df944e2b3abd253d2a7cd376e6e111f9d6f2e0b6474ceb84a5b5f4dcb5609922d4e
diff --git a/app-emulation/libdsk/files/libdsk-1.5.8-include-sysmacros.patch b/app-emulation/libdsk/files/libdsk-1.5.8-include-sysmacros.patch
deleted file mode 100644
index e52b92bf2e33..000000000000
--- a/app-emulation/libdsk/files/libdsk-1.5.8-include-sysmacros.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nuar a/lib/compress.c b/lib/compress.c
---- a/lib/compress.c	2017-02-13 20:34:21.000000000 +0100
-+++ b/lib/compress.c	2018-01-28 15:22:15.571892254 +0100
-@@ -23,6 +23,7 @@
- #include "drvi.h"   /* For LINUXFLOPPY and WIN32FLOPPY */
- #include "compi.h"
- #include "comp.h"
-+#include <sys/sysmacros.h>
- /* LibDsk generalised compression support */
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
-diff -Nuar a/lib/drvlinux.c b/lib/drvlinux.c
---- a/lib/drvlinux.c	2017-02-26 01:43:39.000000000 +0100
-+++ b/lib/drvlinux.c	2018-01-28 15:22:08.661892284 +0100
-@@ -26,6 +26,7 @@
- 
- #include "drvi.h"
- #include "drvlinux.h"
-+#include <sys/sysmacros.h>
- 
- #ifdef LINUXFLOPPY
- 
diff --git a/app-emulation/libdsk/libdsk-1.5.18.ebuild b/app-emulation/libdsk/libdsk-1.5.18.ebuild
new file mode 100644
index 000000000000..6e18e9b1aed0
--- /dev/null
+++ b/app-emulation/libdsk/libdsk-1.5.18.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="LIBDSK is a library for accessing discs and disc image files"
+HOMEPAGE="https://www.seasip.info/Unix/LibDsk/"
+SRC_URI="https://www.seasip.info/Unix/LibDsk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="doc"
+
+DOCS=( doc/${PN}.{txt,pdf} )
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-emulation/libdsk/libdsk-1.5.8.ebuild b/app-emulation/libdsk/libdsk-1.5.8.ebuild
deleted file mode 100644
index e09295e8440b..000000000000
--- a/app-emulation/libdsk/libdsk-1.5.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="LIBDSK is a library for accessing discs and disc image files"
-HOMEPAGE="http://www.seasip.info/Unix/LibDsk/"
-SRC_URI="http://www.seasip.info/Unix/LibDsk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-include-sysmacros.patch
-	eapply_user
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	DOCS="doc/${PN}.txt doc/${PN}.pdf" einstalldocs
-}
diff --git a/app-emulation/libdsk/metadata.xml b/app-emulation/libdsk/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/app-emulation/libdsk/metadata.xml
+++ b/app-emulation/libdsk/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 </pkgmetadata>