gentoo auto-resync : 28:07:2022 - 03:03:20

3 files changed, 11 insertions, 14 deletions

diff --git a/sys-apps/vbetool/Manifest b/sys-apps/vbetool/Manifest
index ccbc355e6742..496710ee5649 100644
--- a/sys-apps/vbetool/Manifest
+++ b/sys-apps/vbetool/Manifest
@@ -1,4 +1,4 @@
-AUX vbetool-1.0-build.patch 537 BLAKE2B e22826304e84fe21f577c3c7db754194103ca97a9b2647063469241f5c213182f4c80007823ef1caa6d79af1d313d560b1e06ebfaf757ec876a618117f2fbb3e SHA512 1b9b1b7471f09ec6dac8f535df1ea6bf09f8824f58c025b92e3e5d3e451a56e750e93836d03ee37e20f14868a9b75e97c548add36256412dfc154530c7a4be12
+AUX vbetool-1.0-build.patch 427 BLAKE2B c1145ae5ec65f79179360386610935db65195d9ae8f6f6642d48cdf4e473572781d536ba52b1729cc18d5569a67fc952a6f4863bfee0950cf3442686b751931c SHA512 b79b5c29ce8af7fdcdbd24e422e0f354e28db8ab3befb163b3a488b1a3a28b5d8fbbfeca654acc558e81487befdc19821482fd2212b31a97d384c440a5376902
 DIST vbetool-1.1.tar.gz 182826 BLAKE2B 6b30eb468e55bedd766161e373e042b5fdf38fd2926bfc8aeb94404350864e835d41642f19be155fcf9a8fbfdc8b4e237e742cabd00626db5e8d17e7c7c5cf6f SHA512 09d8713516f074fe8e901ab3e24aba7e8b9ddf459b3ee3394b7604e4489a70a27c6dc3604cf1284c49233dba908f00da746c583562af2bc93b6df8ff413efd96
-EBUILD vbetool-1.1.ebuild 668 BLAKE2B b13b2bb550daed41297ee4c806a1d5130e2e3e2a041c99fafd7980f7fcdb95638607b285bbb5a258d9ecd8a15b89aa63ceadac59f3c58b36af44e99d10bd8e10 SHA512 a598460e4af9587302d3dca73c14800403e7f434240eff658471b48c0617b6a03dff44b1b9dcc978168599cb22a164fefd3bfba6cc2a3e1e8a78433afba55571
+EBUILD vbetool-1.1-r1.ebuild 626 BLAKE2B 1b17878763988226bf825c6ac2018caa4ac9be78ccc25470ceecd4c0167544c3be4c09e151dd9356ea8a65102208747591e5e3aabd52131e5d18d1b7f6a57195 SHA512 2c83bf7fed2641e41080f240ea9004d80ed72cd194e0019c64f619f8f4493c3362bce9fe7531000095a509fe74702db664bbf7290b11e44d442263794622e380
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/sys-apps/vbetool/files/vbetool-1.0-build.patch b/sys-apps/vbetool/files/vbetool-1.0-build.patch
index 69d2f7b341ba..d0b239146184 100644
--- a/sys-apps/vbetool/files/vbetool-1.0-build.patch
+++ b/sys-apps/vbetool/files/vbetool-1.0-build.patch
@@ -1,8 +1,6 @@
-Index: vbetool-1.0/Makefile.am
-===================================================================
---- vbetool-1.0.orig/Makefile.am
-+++ vbetool-1.0/Makefile.am
-@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,7 @@
  
  sbin_PROGRAMS = vbetool
  
@@ -11,8 +9,10 @@ Index: vbetool-1.0/Makefile.am
  
  man_MANS = vbetool.1
  vbetool_SOURCES = vbetool.c $(x86)
-@@ -14,4 +14,3 @@ maintainer-clean-local: 
+@@ -13,5 +13,4 @@
+ maintainer-clean-local: 
  	$(RM) Makefile.in aclocal.m4 config.h.in stamp-h.in configure
  
- AM_CFLAGS = -g -Wall -pedantic -std=gnu99
+-AM_CFLAGS = -g -Wall -pedantic -std=gnu99
 -AM_LDFLAGS = -lz -lx86
++AM_CFLAGS = -Wall -pedantic -std=gnu99
diff --git a/sys-apps/vbetool/vbetool-1.1.ebuild b/sys-apps/vbetool/vbetool-1.1-r1.ebuild
index 6001b998a371..e6dc1e224d99 100644
--- a/sys-apps/vbetool/vbetool-1.1.ebuild
+++ b/sys-apps/vbetool/vbetool-1.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -12,7 +12,6 @@ SRC_URI="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
 	sys-libs/zlib
@@ -24,8 +23,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.0-build.patch )
 
 src_prepare() {
 	default
-
-	eaclocal # temp fix for #439614
 	eautoreconf
 }