gentoo resync : 28.04.2021

4 files changed, 5 insertions, 39 deletions

diff --git a/app-cdr/xbiso/Manifest b/app-cdr/xbiso/Manifest
index 95055bbd9486..e53fce5d7a2c 100644
--- a/app-cdr/xbiso/Manifest
+++ b/app-cdr/xbiso/Manifest
@@ -1,5 +1,4 @@
-AUX xbiso-0.6.1-libs.patch 830 BLAKE2B afc08139e91399a28763f437cc6b6149f65195003178d1d9d75e9ff33f8fd5ac1647c5e3235bb12e32eab2c0994874ce805fecb0edfd4dd10b6680887dbb63b1 SHA512 727e8d1a7887a9ec8c694700f55c22db07792303c2a79aa091a73f7218b3df85ced7faf079762b94e4c0dbc6f2cabcbe2e14dbd16c1bfc1be43231ae3fd66c7a
+AUX xbiso-0.6.1-libs.patch 758 BLAKE2B 730292d6bcfdd89b05f209477d7ac398f5624075f520f040e5077e98dcdc8409af56a10a697c2c10556e34b37163e51218000f0a2aa290932cd51b16cb9d138f SHA512 922e022da38f3ad2b621cdb382dfd79c1e79397967c3f818f446a42397b37eb2eaab38c0f9d0b0fd595e549adcb44b1508a7bbae1034fcc8586167d1bcf107ad
 DIST xbiso-0.6.1.tar.gz 49698 BLAKE2B ac1605df188b0ec84d0798a0c0220405ce5082160025dc7b21405f1a17f8e0439c6f8d5dbbe293db1645ac0ad195fb0791fe765ea9e1b8c199461f97a2525dce SHA512 351b558c591c3a6c633fb07e081d57cf7ac8b15272ae19878f7d33a796567177aa4eb2fad64d71e6fd86ac18e1c25d30b52013a83ce5d44854f37ec893282fcc
-EBUILD xbiso-0.6.1-r2.ebuild 790 BLAKE2B 7808229d86475624a06913793338d75ed28e66ff13ed27a5bae4acd4cade83ecdb52d32d85389fd736c4f866bd3c01bce701dfd277eea75d753710fba72f3127 SHA512 e13180337d597f44019550978ba3a5ce465322b04061c92fa8b516df4505b66b6211e6edae7fe7d7a35efe9cb1e6a37fd805731e10cd545a12e34163442fcda2
-EBUILD xbiso-0.6.1-r3.ebuild 799 BLAKE2B 61ce71499c1b791bf3de965ea996c2f8eeaee0057769dde1b87b01a101181e8071b6918e9d9e6e4f28c433c06a5d30f6a9dc4f861d9cb8f2b44701d9fc890ec1 SHA512 26337c617650fe436ef9c9772e85e2506b539b10301477d7478f5a563100c6b4e08dedcb5d6c0ee42cda0b568da3e7677f2be179a8fcc84b982bf51545037fa6
+EBUILD xbiso-0.6.1-r3.ebuild 797 BLAKE2B 6b2344b9070ac9bea47acb3abfaca30281b4d2a43c9fc161816753ec9ab6c34995c40fd6fb12ac7f457b887aa3731be6db2ba90cf00b2bed6810ee7ad6b56921 SHA512 5acfb0e5b5410e8a4eaac97d19be607c28f2b5c3bd2138c5e30e9d6d0be33ef0f768b3d4fda094ab0f295387ddce7b413cfe9111e35300e742f55b19085e084a
 MISC metadata.xml 247 BLAKE2B d21bba6853017889144969818fc5147041d96b924fe59bfd2c0eae9d4ddb91ec7a6ded7aba530416dd388787c1e311d00d840e5a9f47d55fb1c7632e6d166c37 SHA512 c99518b71acec8e93cb1ee0d413e78b81984cd4baeb252efc639738813c96655104bc2398d7f2e967edbd0ac4ec1b08c187afad31be039a8f15e3b6a39324cd7
diff --git a/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch b/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
index 32b3523d9c92..0b867751c373 100644
--- a/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
+++ b/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
@@ -1,5 +1,5 @@
---- a/configure.in	2014-12-02 18:56:23.000000000 +0300
-+++ b/configure.in	2014-12-02 19:09:46.724190436 +0300
+--- a/configure.in
++++ b/configure.in
 @@ -6,13 +6,13 @@
  
  dnl Checks for libraries.
diff --git a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
deleted file mode 100644
index 9340e06f7dce..000000000000
--- a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Xbox xdvdfs ISO extraction utility"
-HOMEPAGE="https://sourceforge.net/projects/xbiso/"
-SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-src_prepare() {
-	sed -i -e 's:C) $(CFLAGS):C) $(LDFLAGS) $(CFLAGS):' Makefile.in || die #337769
-	epatch "${FILESDIR}/${P}-libs.patch"
-	mv configure.in configure.ac || die #426262
-	eautoreconf
-}
-
-src_configure() {
-	# for this package, interix behaves the same as BSD
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_BSD
-
-	econf --disable-ftp
-}
-
-src_install() {
-	dobin xbiso
-	dodoc CHANGELOG README
-}
diff --git a/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
index 5894d4c30c22..6d770560ed44 100644
--- a/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
+++ b/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 src_prepare() {