Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/libgnomeprintui/, profiles/, gnome-base/libgnomeprintui/files/
Date: Thu, 16 Aug 2018 21:33:37
Message-Id: 1534455145.4666a0f87ef8cead76e297d35399fee6d171566b.leio@gentoo
1 commit: 4666a0f87ef8cead76e297d35399fee6d171566b
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 16 21:04:03 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 16 21:32:25 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4666a0f8
7
8 gnome-base/libgnomeprintui: Remove last-rited package
9
10 Bug: https://bugs.gentoo.org/352952
11
12 gnome-base/libgnomeprintui/Manifest | 1 -
13 ...libgnomeprintui-2.18.6-adwaita-icon-theme.patch | 12 ------
14 .../files/libgnomeprintui-2.18.6-intl.patch | 10 -----
15 ...omeprintui-2.18.6-orientation-for-preview.patch | 44 ---------------------
16 ...gnomeprintui-2.18.6-system-config-printer.patch | 12 ------
17 .../libgnomeprintui-2.18.6-r2.ebuild | 46 ----------------------
18 gnome-base/libgnomeprintui/metadata.xml | 8 ----
19 profiles/package.mask | 1 -
20 8 files changed, 134 deletions(-)
21
22 diff --git a/gnome-base/libgnomeprintui/Manifest b/gnome-base/libgnomeprintui/Manifest
23 deleted file mode 100644
24 index c4f1df389f7..00000000000
25 --- a/gnome-base/libgnomeprintui/Manifest
26 +++ /dev/null
27 @@ -1 +0,0 @@
28 -DIST libgnomeprintui-2.18.6.tar.bz2 681125 BLAKE2B 2850749f0d41cada9ecc377ff1fad17d1d629094f423f012069790c5b5ec56c047668a8e2d703a11e8654046b1c8e06c075fb350e2d25e05a06622c3a2072efc SHA512 acf44fd8b273f5e48c9c7224647704c1d45a66c8fb7279414028506fd6b8941126636499793c825a767f2f731fcddce78ce750670969d5ff9236e9ff75dca002
29
30 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
31 deleted file mode 100644
32 index f1fc4541db6..00000000000
33 --- a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-adwaita-icon-theme.patch
34 +++ /dev/null
35 @@ -1,12 +0,0 @@
36 -diff -up ./configure.in.orig ./configure.in
37 ---- ./configure.in.orig 2014-05-04 11:07:55.308844477 +0300
38 -+++ ./configure.in 2014-05-04 11:08:26.884571685 +0300
39 -@@ -64,7 +64,7 @@ PKG_CHECK_MODULES(LIBGNOMEPRINTUI, [
40 - gtk+-2.0 >= 2.6.0
41 - libgnomeprint-2.2 >= 2.12.1
42 - libgnomecanvas-2.0 >= 1.117.0
43 -- gnome-icon-theme >= 1.1.92
44 -+ adwaita-icon-theme >= 1.1.92
45 - ])
46 - AC_SUBST(LIBGNOMEPRINTUI_CFLAGS)
47 - AC_SUBST(LIBGNOMEPRINTUI_LIBS)
48
49 diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-intl.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-intl.patch
50 deleted file mode 100644
51 index db206e6b13e..00000000000
52 --- a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-intl.patch
53 +++ /dev/null
54 @@ -1,10 +0,0 @@
55 ---- libgnomeprintui-2.18.6/libgnomeprintui/gpaui/Makefile.am~ 2010-02-09 12:33:13.000000000 +0000
56 -+++ libgnomeprintui-2.18.6/libgnomeprintui/gpaui/Makefile.am 2015-11-03 23:16:49.625137517 +0000
57 -@@ -2,7 +2,6 @@
58 -
59 - INCLUDES = \
60 - -I$(top_srcdir) \
61 -- -I$(top_srcdir)/intl \
62 - -I$(top_srcdir)/libgnomeprintui \
63 - -DWE_ARE_LIBGNOMEPRINT_INTERNALS \
64 - $(LIBGNOMEPRINTUI_CFLAGS) \
65
66 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
67 deleted file mode 100644
68 index 3a6aa63fe35..00000000000
69 --- a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-orientation-for-preview.patch
70 +++ /dev/null
71 @@ -1,44 +0,0 @@
72 ---- ./libgnomeprintui/gnome-print-job-preview.c.orig 2012-02-23 22:48:42.000000000 +0600
73 -+++ ./libgnomeprintui/gnome-print-job-preview.c 2012-02-25 00:18:43.000000000 +0600
74 -@@ -152,6 +152,7 @@
75 - GtkWidget *last;
76 - GnomeCanvas *canvas;
77 - GnomePrintConfig *config;
78 -+ guchar *paper_orientation_save;
79 -
80 - guint current_page, current_offset;
81 -
82 -@@ -2187,6 +2188,19 @@
83 - if (jp->config)
84 - g_object_unref (G_OBJECT (jp->config));
85 - jp->config = config;
86 -+ if( config ) {
87 -+ guchar *txt = gnome_print_config_get( jp->config, (const guchar*)GNOME_PRINT_KEY_PAGE_ORIENTATION );
88 -+ if( ( g_ascii_strcasecmp(( const gchar* )txt, "R90") == 0 ) ||
89 -+ ( g_ascii_strcasecmp(( const gchar* )txt, "R270") == 0 ) ) {
90 -+ jp->paper_orientation_save =
91 -+ gnome_print_config_get( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION );
92 -+ gnome_print_config_set( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION, txt );
93 -+ g_free ( txt );
94 -+ }
95 -+ else {
96 -+ jp->paper_orientation_save = NULL;
97 -+ }
98 -+ }
99 - if (!jp->config)
100 - return;
101 - g_object_ref (G_OBJECT (jp->config));
102 -@@ -2389,6 +2403,13 @@
103 - {
104 - GnomePrintJobPreview *jp = GNOME_PRINT_JOB_PREVIEW (object);
105 -
106 -+ if( jp->paper_orientation_save ) {
107 -+ gnome_print_config_set( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION,
108 -+ jp->paper_orientation_save );
109 -+ g_free ( jp->paper_orientation_save );
110 -+ jp->paper_orientation_save = NULL;
111 -+ }
112 -+
113 - gnome_print_job_preview_set_config (jp, NULL);
114 - gnome_print_job_preview_set_job (jp, NULL);
115 -
116
117 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
118 deleted file mode 100644
119 index 57e188c863b..00000000000
120 --- a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-system-config-printer.patch
121 +++ /dev/null
122 @@ -1,12 +0,0 @@
123 -diff -p -up libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c.system-config-printer libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c
124 ---- libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c.system-config-printer 2008-09-23 10:49:59.000000000 +0200
125 -+++ libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c 2008-09-23 10:50:47.000000000 +0200
126 -@@ -47,7 +47,7 @@
127 - #include "gpaui/gpa-transport-selector.h"
128 -
129 - #define GPS_PAD 4
130 --#define ADD_PRINTER_APP "gnome-cups-add"
131 -+#define ADD_PRINTER_APP "system-config-printer"
132 -
133 - static void gnome_printer_selector_class_init (GnomePrinterSelectorClass *klass);
134 - static void gnome_printer_selector_init (GObject *object);
135
136 diff --git a/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild b/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild
137 deleted file mode 100644
138 index ab335f9a137..00000000000
139 --- a/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild
140 +++ /dev/null
141 @@ -1,46 +0,0 @@
142 -# Copyright 1999-2017 Gentoo Foundation
143 -# Distributed under the terms of the GNU General Public License v2
144 -
145 -EAPI=6
146 -GNOME_TARBALL_SUFFIX="bz2"
147 -
148 -inherit autotools gnome2 multilib-minimal
149 -
150 -DESCRIPTION="User interface libraries for gnome print"
151 -HOMEPAGE="https://www.gnome.org/"
152 -
153 -LICENSE="GPL-2 LGPL-2.1"
154 -SLOT="2.2"
155 -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
156 -IUSE=""
157 -
158 -RDEPEND="
159 - >=gnome-base/libgnomeprint-2.12.1[${MULTILIB_USEDEP}]
160 - >=gnome-base/libgnomecanvas-1.117[${MULTILIB_USEDEP}]
161 - >=x11-libs/gtk+-2.6:2[${MULTILIB_USEDEP}]
162 - x11-themes/adwaita-icon-theme
163 -"
164 -DEPEND="${RDEPEND}
165 - sys-devel/gettext
166 - virtual/pkgconfig[${MULTILIB_USEDEP}]
167 -"
168 -
169 -src_prepare() {
170 - # Patches from Mageia
171 - eapply "${FILESDIR}"/${P}-adwaita-icon-theme.patch
172 - eapply "${FILESDIR}"/${P}-intl.patch
173 - eapply "${FILESDIR}"/${P}-orientation-for-preview.patch
174 - eapply "${FILESDIR}"/${P}-system-config-printer.patch
175 - eautoreconf
176 - gnome2_src_prepare
177 -}
178 -
179 -multilib_src_configure() {
180 - ECONF_SOURCE=${S} \
181 - gnome2_src_configure \
182 - --disable-static
183 -}
184 -
185 -multilib_src_install() {
186 - gnome2_src_install
187 -}
188
189 diff --git a/gnome-base/libgnomeprintui/metadata.xml b/gnome-base/libgnomeprintui/metadata.xml
190 deleted file mode 100644
191 index 39980802b1d..00000000000
192 --- a/gnome-base/libgnomeprintui/metadata.xml
193 +++ /dev/null
194 @@ -1,8 +0,0 @@
195 -<?xml version="1.0" encoding="UTF-8"?>
196 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
197 -<pkgmetadata>
198 -<maintainer type="project">
199 - <email>gnome@g.o</email>
200 - <name>Gentoo GNOME Desktop</name>
201 -</maintainer>
202 -</pkgmetadata>
203
204 diff --git a/profiles/package.mask b/profiles/package.mask
205 index 57da48c9724..7d1aae0405f 100644
206 --- a/profiles/package.mask
207 +++ b/profiles/package.mask
208 @@ -102,7 +102,6 @@ dev-python/django-celery
209 # Obsolete early GNOME 2 era print libraries. Applications
210 # use printing support found directly in x11-libs/gtk+ now.
211 # Removal in 30 days. Bug #352952
212 -gnome-base/libgnomeprintui
213 gnome-base/libgnomeprint
214
215 # Mart Raudsepp <leio@g.o> (16 Jul 2018)