gentoo resync : 12.05.2022

4 files changed, 1 insertions, 56 deletions

diff --git a/app-emulation/libdsk/Manifest b/app-emulation/libdsk/Manifest
index adf981e2cee8..8a781569394e 100644
--- a/app-emulation/libdsk/Manifest
+++ b/app-emulation/libdsk/Manifest
@@ -1,6 +1,3 @@
-AUX libdsk-1.5.8-include-sysmacros.patch 676 BLAKE2B 7617b02bac41a86e292009b7a651eb3bbc94b3409f8391c9345ce74558d9f526c7f1210c80e0d738d57a867f6cb3f6cb780ea6aa37a911eebc3a6be7671c78f4 SHA512 d4a38e7be2f3835c14c8d2be9dd4ae6cd75653efe65b0276e3f009895e35b257b0f819a711f1ac623dfe80d462676ac4eccfaf1ac68011db61e4992dde2450f5
 DIST libdsk-1.5.18.tar.gz 1295474 BLAKE2B 36dd2a0c5a53899b721dc46848c79a36b80ebb30d8210eacf7462d5785c607f00b69ca26ea4ec35bd3e03f5203043e6aa0687b2212672b274305e9f5aad8ce6e SHA512 5d845084f6c7791813be7c2afcd34a52cebb217ddcdafe1953fcbd55ce5b7df944e2b3abd253d2a7cd376e6e111f9d6f2e0b6474ceb84a5b5f4dcb5609922d4e
-DIST libdsk-1.5.8.tar.gz 1212684 BLAKE2B 52a2687d8ade0378096215d362df21b6eb477b3304910bb98c56264fb05bec6ad2d2b7254dd132fe50e60d5179b4875a1a91088f8ed93f68886054bf1df060f4 SHA512 6bb332dcd58b88272130a950ed686852f66a1e97030aaa280db3bc65a7f82513d57055c2cc3e653e1e06843c453e46a52ce280b45b42c0bb671d1e0f6d7c9520
-EBUILD libdsk-1.5.18.ebuild 549 BLAKE2B e369d7ddb89e562543389e3d7c579098536db18004669da71bf67f5a756a7c5bbd002cd1ee687d5c541863510f57c39d952bf6d21a23ef7f5355693ccbdd4f2d SHA512 21c4e81a8c0ddd03e5afc95dcd2e43983a03812bd1bd87076645aa42d2170b88a1ef499015bac0c591c39644aecd16bb48ae676460fea2abf560d13a6938520d
-EBUILD libdsk-1.5.8.ebuild 546 BLAKE2B 7132e7807205062f6b9d5a2bf17685bf3e1ebe07e3fb97ec0ebc3931730e0909178b9f01543d496264aa57fc37108732cb9ec528465ce9ace5f5c94f0a286638 SHA512 94e5fb495985f85971b51b93901ceffda68d5fbd302be5f0b8ba93f3579b97d9e43db80d1ba5e4f4d6d8f0072a5deeff3b49a863fb811a03273d155b8ab51a3f
+EBUILD libdsk-1.5.18.ebuild 448 BLAKE2B 3f7c5886cb3b5a6e7020bbb931b301cad91d1ad4365fa23212d391f71d4f042732296ee25761b8bbcc7ba4bdefc2977e4db5789c2b92368151e61d6318e5712f SHA512 d73a8eee8f8971b57ea1d5285288e9f5181a890e14266260c90c318cd90bd4b68a414b89be07e040d0374a936e9c68f37e9c4f6d18c13ac415ed22021aa6211d
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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
index 42856262a0ac..6e18e9b1aed0 100644
--- a/app-emulation/libdsk/libdsk-1.5.18.ebuild
+++ b/app-emulation/libdsk/libdsk-1.5.18.ebuild
@@ -12,13 +12,8 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE="doc"
 
-#PATCHES=( "${FILESDIR}"/${P}-include-sysmacros.patch )
 DOCS=( doc/${PN}.{txt,pdf} )
 
-src_configure() {
-	econf --disable-static
-}
-
 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 2b4c246fa6d7..000000000000
--- a/app-emulation/libdsk/libdsk-1.5.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-PATCHES=( "${FILESDIR}"/${P}-include-sysmacros.patch )
-DOCS=( doc/${PN}.{txt,pdf} )
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}