gentoo new year resync : 01.01.2021

3 files changed, 83 insertions, 12 deletions

diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest
index 45a81538f5f6..496346e557dc 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,5 +1,6 @@
+AUX cndrvcups-common-lb-3.70-fno-common.patch 2543 BLAKE2B 01af53fa5f40f9abe9aba3703ea9f84639aedc15dd7f0319c0beecb6ecf67bbe799baf089fba3a52a9cfc2700c6a09dc2581d699de9d92edb3eb14b17f039fe9 SHA512 256bfcade97eec388b8264fdc154a52c6623e902b469fb8ad55a76bbc52bfe85b1106a9055dfa3d79e70319dc2726841af4c6fb38e7c258fc6b989f8761952d4
 DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21 SHA512 c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
 DIST linux-UFRII-drv-v370-uken-05.tar.gz 117334511 BLAKE2B 295c7a710b0f1ee29e642b29c7b0576f68317dba93758825aa85d431129cebea174d5c2dfa67f7506fa3b18fe48d373f0dc9331ed9caabc2e3bc733946aefd97 SHA512 d83254b7f7f87c56caeaaf151d898de36f746c03ad88d427959bdeec905b9cd92a14a8ac534073473a6cefbb5e2b0be9e9faa79b500e252ecd0a0564d2312bbc
 EBUILD cndrvcups-common-lb-3.60-r1.ebuild 2922 BLAKE2B f002fb0784954843a02d04f216bcaa2901c728d337831e96c9dd6a4ba1b1060dca91407704d943bdd510313cb00d31afab83ce295850912e5241581721ca2719 SHA512 8765fba45ca858827f7b0cb7ca655a31376ef22a7694d1ffb0416b7807e80b2383523d850dcd825e6b6b1aac48de14a6957b5422f3089ad190a1ff573feac35f
-EBUILD cndrvcups-common-lb-3.70.ebuild 3052 BLAKE2B 489d4875edfed37ba6c5102c6575f0824c1ed797683fbac6ac3928b87297420f7c6fd4d8830c9946562a884c4dd72cee5451aeba0b2d2d727c08d716a258dd46 SHA512 6f22bb4da8a3e098085e884316150bb62ffa61f72d79a546ecc2be59dc177e2728857c74c485ed0dd0be87f7933715c83b63b30ea563bdfc081ee4a7d439308b
+EBUILD cndrvcups-common-lb-3.70.ebuild 3236 BLAKE2B 7a99961d7fcc0548a1e664d7dd1a90343942f8ea5babeb2966ae302f45b031d35d52723b2770be87ff87ed175c7c392b23fd39708022e99eea5107b520d04421 SHA512 d7cbd7dfe11c11e92646761009ff7915eed5691c6d92444ed518abf5a7f5a5c83d5190edf14c328b17ff46dfea9d8754bb8337f6889abfce6b3fa25acffe1a47
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
index 23e5c3724b52..41880207f325 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools
+
+inherit autotools toolchain-funcs
 
 MY_PV="$(ver_rs 1- '')"
 SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
@@ -15,19 +16,18 @@ SRC_URI="http://gdlp01.c-wss.com/gds/8/0100007658/08/${SOURCES_NAME}-05.tar.gz"
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6:2
 	>=gnome-base/libglade-2.4:2.0
 	>=net-print/cups-1.1.17
-	>=x11-libs/gtk+-2.4:2
-"
+	>=x11-libs/gtk+-2.4:2"
 DEPEND="${DEPEND}"
-BDEPEND=""
 
 S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.10}"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 pkg_setup() {
 	# Don't raise a fuss over pre-built binaries
 	QA_PREBUILT="
@@ -39,11 +39,9 @@ pkg_setup() {
 		/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
 		/usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
 		/usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
-		/usr/$(get_libdir)/libcanonc3pl.so.1.0.0
-	"
+		/usr/$(get_libdir)/libcanonc3pl.so.1.0.0"
 	QA_SONAME="
-		/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
-	"
+		/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0"
 }
 
 src_unpack() {
@@ -66,6 +64,8 @@ src_prepare() {
 		"s:backenddir = \$(libdir)/cups/backend:backenddir = `cups-config --serverbin`/backend:" \
 		backend/Makefile.am || die
 
+	sed -i -e "s@CC=gcc@CC=$(tc-getCC)@" c3plmod_ipc/Makefile || die
+
 	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
 	change_dir mv configure.in configure.ac
 	change_dir sed -i -e 's/configure.in/configure.ac/' configure.ac
@@ -77,7 +77,7 @@ src_configure() {
 }
 
 src_compile() {
-	change_dir emake
+	change_dir emake AR="$(tc-getAR)"
 
 	# Cannot be moved to 'change_dir' as it doesn't need eautoreconf
 	cd "${S}/c3plmod_ipc" || die
@@ -116,4 +116,6 @@ src_install() {
 	if [[ "$(get_libdir)" != lib ]] && [[ ${SYMLINK_LIB} = yes ]]; then
 		dosym "../$(get_libdir)/libc3pl.so" /usr/lib/libc3pl.so
 	fi
+
+	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
 }
diff --git a/net-print/cndrvcups-common-lb/files/cndrvcups-common-lb-3.70-fno-common.patch b/net-print/cndrvcups-common-lb/files/cndrvcups-common-lb-3.70-fno-common.patch
new file mode 100644
index 000000000000..fd17f6b72b19
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/files/cndrvcups-common-lb-3.70-fno-common.patch
@@ -0,0 +1,68 @@
+--- a/cngplp/src/load.c
++++ b/cngplp/src/load.c
+@@ -29,6 +29,17 @@ GModule* g_module = NULL;
+ char pre_lib_name[MAX_PATH];
+ gboolean first_load = TRUE;
+ 
++void (*ShowPDLDialog)(const char* name, int print);
++gboolean (*InitPDLController)(GtkWidget* main_dlg, char *printer_name, const char* print_file, gboolean first_load);
++void (*UpdatePDLData)(int id, const char* value);
++void (*UpdatePDLDataInt)(int id, int value);
++void (*ClosePDLController)();
++void (*SavePDLPrinterData)();
++void (*PrintPDLFile)();
++char* (*GetPDLData)(int id);
++int (*GetPDLDataInt)(int id, int def);
++int (*ExecPDLJobMode)();
++
+ int LoadPDL(GladeXML* main_xml, const char* print_file)
+ {
+ 	GtkWidget* main_dlg = NULL;
+--- a/cngplp/src/load.h
++++ b/cngplp/src/load.h
+@@ -28,15 +28,15 @@
+ 
+ int LoadPDL(GladeXML* main_xml, const char* print_file);
+ void UnLoadPDL();
+-void (*ShowPDLDialog)(const char* name, int print);
+-gboolean (*InitPDLController)(GtkWidget* main_dlg, char *printer_name, const char* print_file, gboolean first_load);
+-void (*UpdatePDLData)(int id, const char* value);
+-void (*UpdatePDLDataInt)(int id, int value);
+-void (*ClosePDLController)();
+-void (*SavePDLPrinterData)();
+-void (*PrintPDLFile)();
+-char* (*GetPDLData)(int id);
+-int (*GetPDLDataInt)(int id, int def);
+-int (*ExecPDLJobMode)();
++extern void (*ShowPDLDialog)(const char* name, int print);
++extern gboolean (*InitPDLController)(GtkWidget* main_dlg, char *printer_name, const char* print_file, gboolean first_load);
++extern void (*UpdatePDLData)(int id, const char* value);
++extern void (*UpdatePDLDataInt)(int id, int value);
++extern void (*ClosePDLController)();
++extern void (*SavePDLPrinterData)();
++extern void (*PrintPDLFile)();
++extern char* (*GetPDLData)(int id);
++extern int (*GetPDLDataInt)(int id, int def);
++extern int (*ExecPDLJobMode)();
+ 
+ #endif
+--- a/cngplp/src/mainwnd.c
++++ b/cngplp/src/mainwnd.c
+@@ -82,6 +82,17 @@ static int g_stdout_fd;
+ static void SaveOptions();
+ static void LoadOptions();
+ 
++extern void (*ShowPDLDialog)(const char* name, int print);
++extern gboolean (*InitPDLController)(GtkWidget* main_dlg, char *printer_name, const char* print_file, gboolean first_load);
++extern void (*UpdatePDLData)(int id, const char* value);
++extern void (*UpdatePDLDataInt)(int id, int value);
++extern void (*ClosePDLController)();
++extern void (*SavePDLPrinterData)();
++extern void (*PrintPDLFile)();
++extern char* (*GetPDLData)(int id);
++extern int (*GetPDLDataInt)(int id, int def);
++extern int (*ExecPDLJobMode)();
++
+ void DisposeMainDlg()
+ {
+ 	int i = 0;