gentoo auto-resync : 09:09:2022 - 10:40:04

2 files changed, 17 insertions, 18 deletions

diff --git a/media-libs/libgii/Manifest b/media-libs/libgii/Manifest
index 6dd1c4488661..0adc947b77c6 100644
--- a/media-libs/libgii/Manifest
+++ b/media-libs/libgii/Manifest
@@ -2,5 +2,5 @@ AUX libgii-0.9.0-linux26-headers.patch 422 BLAKE2B 630d1c98cc2e9b5424dbc41d2453e
 AUX libgii-1.0.2-configure-cpuid-pic.patch 451 BLAKE2B 2a19985eda7c5cafaf40d68b20338193996d18cfaa11639e31ea2c38c3e4eda5808c8efbbb39b46dd9ad2570adabf0195b287c9307a603c2e5497e6f5dfb1074 SHA512 94aa2b1996ac7ccc1275853c72bda6a0f050c79010354d87dd551484c8bf3fb8eaa2cbc6b13620cb317bddc9da938c3106af71e2f0da70f9b62db7e27c404743
 AUX libgii-1.0.2-libtool_1.5_compat.patch 468 BLAKE2B 32d18ef7cfa6e14be36e8eeccf321a988990b3f48caa422ec07988dd8cde0d4c5c1ae7233700c696e45933b56f7555a1b00efd1062be1f4f5d73074b1695cea7 SHA512 c7c2d3cd91ba91cdc60778f5d599f2ee428c3b41a213193f733c4fe86b8e2a778009f8816d6314ad7519e5732065cf51016441306bb05f7ba669ef4000769312
 DIST libgii-1.0.2.src.tar.bz2 701099 BLAKE2B 29e23c4f0b0045e05dac855bba10d03e5b38cc3b2fdd494892c52954b4c4bbd990148aff98540bef73048ae26bab79db3369e7731707bfa4eab2b39d256681ad SHA512 d45b236e08bb8c6a7a7741ae694650dfc5681712a174f923c9132c41acb388d0d6dbc5589104a7a6bc73c98088f2b5967ee726d83c1f3e913602661c8d30bf07
-EBUILD libgii-1.0.2-r2.ebuild 1243 BLAKE2B 563e83f0713ad66e1e439c0b11fc7651e863bd44dc83161f0ce305e19dda463733e3794150f0a36296d42ce8e9a054425b2ea3694d09f6f1fe07ac5af46e24fe SHA512 f8656e6a20bfb114f05bd3730cd0abbbd0ffdb30557e8adb039c6053ff74232f0dff19fe495ce0acc8cc248e487564e37cb80aad77efb0a264ad0581014918bc
+EBUILD libgii-1.0.2-r3.ebuild 1057 BLAKE2B 649429780100a1159f1bd044ca501c6d98436f97e52a75664614ee86fc2cceedc33b5cef56be1c047d4b0f833ebb098cf35458257b7938f64de0ff889e69046d SHA512 ad2c21a58787caf94d7487326f75bf487f46e9af31e1f893a26cd9bfc0c907920abf2f997e2be94dddf0c48dfbe0d1113fde4706b71f17b8c22fc18fd5ade67c
 MISC metadata.xml 297 BLAKE2B 5224c162fdbab9d408c0b908e21f3b910c078888b850127f6c0ac140f1db19de89677b89465d56efe0d336e9f3bba8ffb0167d228c2daaba8c05c819e8788c35 SHA512 1d1d5cf70a0dddfb1f131cb9253cb13dbed3995a801485ca0a4e7194ef128e50cd70e42113d4d2c0d3b73b09d520ef5e3fd2b41fd2dd078a42c6c17f1f6976f8
diff --git a/media-libs/libgii/libgii-1.0.2-r2.ebuild b/media-libs/libgii/libgii-1.0.2-r3.ebuild
index fa64df33f0cc..1d7d2bbc8b70 100644
--- a/media-libs/libgii/libgii-1.0.2-r2.ebuild
+++ b/media-libs/libgii/libgii-1.0.2-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
 DESCRIPTION="Easy to use, but yet powerful, API for all possible input sources"
 HOMEPAGE="https://ibiblio.org/ggicore/packages/libgii.html"
@@ -16,8 +16,8 @@ IUSE="X"
 
 RDEPEND="
 	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86dga-1.1.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2
+		>=x11-libs/libXxf86dga-1.1.4
 	)"
 DEPEND="${RDEPEND}
 	kernel_linux? ( >=sys-kernel/linux-headers-2.6.11 )"
@@ -28,28 +28,27 @@ PATCHES=(
 	"${FILESDIR}"/${P}-libtool_1.5_compat.patch
 )
 
-DOCS=( ChangeLog ChangeLog.1999 FAQ NEWS README )
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/ggi/system.h )
-
 src_prepare() {
 	default
-	rm -f acinclude.m4 m4/libtool.m4 m4/lt*.m4
-	AT_M4DIR=m4 eautoreconf
 
-	multilib_copy_sources
+	rm -f acinclude.m4 m4/libtool.m4 m4/lt*.m4 || die
+
+	AT_M4DIR="m4" eautoreconf
 }
 
-multilib_src_configure() {
+src_configure() {
 	local myeconfargs=(
 		$(use_with X x)
 		$(use_enable X x)
-		--disable-static
 	)
-	econf ${myeconfargs[@]}
+
+	econf "${myeconfargs[@]}"
 }
 
-multilib_src_install() {
+src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+
+	dodoc ChangeLog.1999
+
+	find "${ED}" -name '*.la' -delete || die
 }