M net-print/epson-inkjet-printer/epson-inkjet-printer-1.0.0.ebuild → net-print/epson-inkjet-printer/epson-inkjet-printer-1.0.0.ebuild

@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools
-inherit rpm
+inherit autotools rpm multilib-minimal
 
 DESCRIPTION="Epson Inkjet Printer Driver (ESC/P)"
 HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
@@ -13,14 +12,15 @@
 S="${WORKDIR}/${PN}-filter-${PV}"
 
 # don't know if it's ok to specify custom variables, but why not
-
 _printer_dir="${WORKDIR}/${PN}-201207w-${PV}"
 _cups_libexec_dir="/usr/libexec/cups"
 
 LICENSE="GPL-2 EPSON-EULA"
 SLOT="0"
 KEYWORDS="amd64"
-IUSE="abi_x86_32"
+IUSE="debug"
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
 
 DEPEND="net-print/cups"
 RDEPEND="${DEPEND}"
@@ -38,15 +38,23 @@ }
 
 src_prepare() {
 	default
+
 	eautoreconf
 
 	sed -i -e "/^\*cupsFilter/ s:/opt/${PN}-201207w/cups/lib:${_cups_libexec_dir}:" \
 		-e "s:/opt/${PN}-201207w:/usr/share/${PN}:" \
 		${_printer_dir}/ppds/*.ppd
+
+	multilib_copy_sources
 }
 
 src_configure() {
-	econf LDFLAGS="${LDFLAGS} -Wl,--no-as-needed" --enable-debug
+
+	local conf=(
+		LDFLAGS="${LDFLAGS} -Wl,--no-as-needed"
+		$(use_enable debug)
+	)
+	econf "${conf[@]}"
 }
 
 src_install() {
@@ -55,9 +63,16 @@
 	if use abi_x86_32; then
 		dolib.so "${_printer_dir}/lib/libEpson_201207w.MT.so.1.0.0" \
 			"${_printer_dir}/lib/libEpson_201207w.so.1.0.0"
-	else
+
+		dosym libEpson_201207w.MT.so.1.0.0 /usr/$(get_libdir)/libEpson_201207w.MT.so.1
+		dosym libEpson_201207w.so.1.0.0 /usr/$(get_libdir)/libEpson_201207w.so.1
+	fi
+	if use abi_x86_64; then
 		dolib.so "${_printer_dir}/lib64/libEpson_201207w.MT.so.1.0.0" \
 			"${_printer_dir}/lib64/libEpson_201207w.so.1.0.0"
+
+		dosym libEpson_201207w.MT.so.1.0.0 /usr/$(get_libdir)/libEpson_201207w.MT.so.1
+		dosym libEpson_201207w.so.1.0.0 /usr/$(get_libdir)/libEpson_201207w.so.1
 	fi
 
 	insinto "/usr/share/${PN}"
@@ -66,5 +81,4 @@ "${_printer_dir}/watermark/"
 
 	insinto "/usr/share/ppd/${PN}"
 	doins ${_printer_dir}/ppds/*.ppd
-
 }

M net-print/epson-inkjet-printer/metadata.xml → net-print/epson-inkjet-printer/metadata.xml

@@ -6,6 +6,6 @@ <email>aaoth@aaoth.xyz</email>
 		<name>la ninpre</name>
 	</maintainer>
 	<use>
-        <flag name="abi_x86_32">enable 32-bit abi</flag>
+		<flag name="abi_x86_32">enable 32-bit abi</flag>
 	</use>
 </pkgmetadata>