gentoo resync : 14.07.2018

7 files changed, 139 insertions, 0 deletions

diff --git a/gnome-base/libgnomeprintui/Manifest b/gnome-base/libgnomeprintui/Manifest
new file mode 100644
index 000000000000..64f42cabd4be
--- /dev/null
+++ b/gnome-base/libgnomeprintui/Manifest
@@ -0,0 +1,7 @@
+AUX libgnomeprintui-2.18.6-adwaita-icon-theme.patch 432 BLAKE2B aa074c916814318b030fdfd2a3280d4d8a2651fb8849612b719ea56832688d8d5e31fa363dfbe426687c6b0ec6168488375a491617d26dd34aabff6fe1e9d460 SHA512 99af09eb081b419d126ac0bc664da16cfae67fede67190f67f48642efa1624cb49690601514ff77978c9577b76d9c9e79b775f96eab0961e890871be2a88681a
+AUX libgnomeprintui-2.18.6-intl.patch 375 BLAKE2B 3b7e6940ff666cb6c2bd0ba38242c5ed3d0d12020c649f1ac8500a7c70d691d217797eb2df04838272468730e173e16be648f8120950f7dae8cdeea112e14847 SHA512 78f37aa03642d78eef38923b9b487748c275571ddba090ce96c52797f7166f8930f937c3b579fcd83255d9fa703c6fb5f718d734cfb9e2af289059ee482035ee
+AUX libgnomeprintui-2.18.6-orientation-for-preview.patch 1660 BLAKE2B b86a794c8e5942de0469cd2f6de5c2b873df3fe321f25bc8e8923d9644f8a4ac7bcc36bfbb0c29b5a2a4c2e7cb3aa3b0b0c05db6a5094c6712bcf7385a12b815 SHA512 aac905ee6e66367a36a2f2d1d256e3a97f1071fbd445e5d759a42ede3f0f59c3e80b4108b948de3b44ab24a0c2ae8cc32dbc72dbbbb3bde6c94d725741faa6b6
+AUX libgnomeprintui-2.18.6-system-config-printer.patch 710 BLAKE2B 342dc6936553a6fa2c51e119056058275255bf720b6fa5bb0dd551ae5f2d4821ddfb048416b0ad61b481a4b59e9468bbf3b7cd348a7304a90e323530577c1628 SHA512 35323ad7e829ce5dc0f607637e16cfeb5d88fe63685801887b2c295b5f81640722d9f25c1e85c9a346c6dd2c38bde5bcc9cb97c529a154dfd5d52a6b66452c70
+DIST libgnomeprintui-2.18.6.tar.bz2 681125 BLAKE2B 2850749f0d41cada9ecc377ff1fad17d1d629094f423f012069790c5b5ec56c047668a8e2d703a11e8654046b1c8e06c075fb350e2d25e05a06622c3a2072efc SHA512 acf44fd8b273f5e48c9c7224647704c1d45a66c8fb7279414028506fd6b8941126636499793c825a767f2f731fcddce78ce750670969d5ff9236e9ff75dca002
+EBUILD libgnomeprintui-2.18.6-r2.ebuild 1143 BLAKE2B 840c6958808eafe15e0de13eb5ef103020003625e5285dc8920b2118b1a5596b79968570e584a54f75a58a2fc799469e8ff61e09cd36e83d8cd47c9f5bbca4f1 SHA512 6a4e8afc4cba31086cce62d2602b3fde587e808035b5fa99c73420750e8dbd4f1f24c8401310f8f6c9705c0cf0e5cd0fbf1d3d94f56c4e4cb3b91aba069928eb
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-adwaita-icon-theme.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-adwaita-icon-theme.patch
new file mode 100644
index 000000000000..f1fc4541db65
--- /dev/null
+++ b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-adwaita-icon-theme.patch
@@ -0,0 +1,12 @@
+diff -up ./configure.in.orig ./configure.in
+--- ./configure.in.orig	2014-05-04 11:07:55.308844477 +0300
++++ ./configure.in	2014-05-04 11:08:26.884571685 +0300
+@@ -64,7 +64,7 @@ PKG_CHECK_MODULES(LIBGNOMEPRINTUI, [
+ 	gtk+-2.0	   >= 2.6.0
+ 	libgnomeprint-2.2  >= 2.12.1
+ 	libgnomecanvas-2.0 >= 1.117.0
+-	gnome-icon-theme   >= 1.1.92
++	adwaita-icon-theme >= 1.1.92
+ ])
+ AC_SUBST(LIBGNOMEPRINTUI_CFLAGS)
+ AC_SUBST(LIBGNOMEPRINTUI_LIBS)
diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-intl.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-intl.patch
new file mode 100644
index 000000000000..db206e6b13e8
--- /dev/null
+++ b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-intl.patch
@@ -0,0 +1,10 @@
+--- libgnomeprintui-2.18.6/libgnomeprintui/gpaui/Makefile.am~	2010-02-09 12:33:13.000000000 +0000
++++ libgnomeprintui-2.18.6/libgnomeprintui/gpaui/Makefile.am	2015-11-03 23:16:49.625137517 +0000
+@@ -2,7 +2,6 @@
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir) \
+-	-I$(top_srcdir)/intl \
+ 	-I$(top_srcdir)/libgnomeprintui \
+ 	-DWE_ARE_LIBGNOMEPRINT_INTERNALS \
+ 	$(LIBGNOMEPRINTUI_CFLAGS)	\
diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-orientation-for-preview.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-orientation-for-preview.patch
new file mode 100644
index 000000000000..3a6aa63fe356
--- /dev/null
+++ b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-orientation-for-preview.patch
@@ -0,0 +1,44 @@
+--- ./libgnomeprintui/gnome-print-job-preview.c.orig	2012-02-23 22:48:42.000000000 +0600
++++ ./libgnomeprintui/gnome-print-job-preview.c	2012-02-25 00:18:43.000000000 +0600
+@@ -152,6 +152,7 @@ 
+ 	GtkWidget *last;
+ 	GnomeCanvas *canvas;
+ 	GnomePrintConfig *config;
++    guchar *paper_orientation_save;
+ 
+ 	guint current_page, current_offset;
+ 
+@@ -2187,6 +2188,19 @@ 
+ 	if (jp->config)
+ 		g_object_unref (G_OBJECT (jp->config));
+ 	jp->config = config;
++    if( config ) {
++        guchar *txt = gnome_print_config_get( jp->config, (const guchar*)GNOME_PRINT_KEY_PAGE_ORIENTATION );
++        if( ( g_ascii_strcasecmp(( const gchar* )txt, "R90") == 0 ) ||
++            ( g_ascii_strcasecmp(( const gchar* )txt, "R270") == 0 ) ) {
++            jp->paper_orientation_save =
++                gnome_print_config_get( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION );
++            gnome_print_config_set( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION, txt );
++            g_free ( txt );
++        }
++        else {
++            jp->paper_orientation_save = NULL;
++        }
++    }
+ 	if (!jp->config)
+ 		return;
+ 	g_object_ref (G_OBJECT (jp->config));
+@@ -2389,6 +2403,13 @@ 
+ {
+ 	GnomePrintJobPreview *jp = GNOME_PRINT_JOB_PREVIEW (object);
+ 
++    if( jp->paper_orientation_save ) {
++        gnome_print_config_set( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION,
++                                jp->paper_orientation_save );
++        g_free ( jp->paper_orientation_save );
++        jp->paper_orientation_save = NULL;
++    }
++
+ 	gnome_print_job_preview_set_config (jp, NULL);
+ 	gnome_print_job_preview_set_job (jp, NULL);
+ 
diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-system-config-printer.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-system-config-printer.patch
new file mode 100644
index 000000000000..57e188c863b7
--- /dev/null
+++ b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-system-config-printer.patch
@@ -0,0 +1,12 @@
+diff -p -up libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c.system-config-printer libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c
+--- libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c.system-config-printer	2008-09-23 10:49:59.000000000 +0200
++++ libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c	2008-09-23 10:50:47.000000000 +0200
+@@ -47,7 +47,7 @@
+ #include "gpaui/gpa-transport-selector.h"
+ 
+ #define GPS_PAD 4
+-#define ADD_PRINTER_APP	"gnome-cups-add"
++#define ADD_PRINTER_APP	"system-config-printer"
+ 
+ static void gnome_printer_selector_class_init (GnomePrinterSelectorClass *klass);
+ static void gnome_printer_selector_init (GObject *object);
diff --git a/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild b/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild
new file mode 100644
index 000000000000..ab335f9a1373
--- /dev/null
+++ b/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit autotools gnome2 multilib-minimal
+
+DESCRIPTION="User interface libraries for gnome print"
+HOMEPAGE="https://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="2.2"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=gnome-base/libgnomeprint-2.12.1[${MULTILIB_USEDEP}]
+	>=gnome-base/libgnomecanvas-1.117[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.6:2[${MULTILIB_USEDEP}]
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	# Patches from Mageia
+	eapply "${FILESDIR}"/${P}-adwaita-icon-theme.patch
+	eapply "${FILESDIR}"/${P}-intl.patch
+	eapply "${FILESDIR}"/${P}-orientation-for-preview.patch
+	eapply "${FILESDIR}"/${P}-system-config-printer.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/gnome-base/libgnomeprintui/metadata.xml b/gnome-base/libgnomeprintui/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-base/libgnomeprintui/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>