Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-java/flyingsaucer/, dev-java/flyingsaucer/files/
Date: Sat, 14 Sep 2019 15:26:21
Message-Id: 1568474757.305f3c4136b7a57be67d73bf833d9a70a718ee8a.mgorny@gentoo
1 commit: 305f3c4136b7a57be67d73bf833d9a70a718ee8a
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 14 15:23:13 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 14 15:25:57 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=305f3c41
7
8 dev-java/flyingsaucer: Remove last-rited pkg
9
10 Bug: https://bugs.gentoo.org/607720
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 dev-java/flyingsaucer/Manifest | 1 -
14 dev-java/flyingsaucer/files/7-itext-2.0.8.patch | 61 --------------------
15 dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild | 75 -------------------------
16 dev-java/flyingsaucer/metadata.xml | 14 -----
17 profiles/package.mask | 1 -
18 5 files changed, 152 deletions(-)
19
20 diff --git a/dev-java/flyingsaucer/Manifest b/dev-java/flyingsaucer/Manifest
21 deleted file mode 100644
22 index 16e8d5504dc..00000000000
23 --- a/dev-java/flyingsaucer/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST flyingsaucer-R7final-src.zip 7058444 BLAKE2B 30c9b13cc376a5ef3c215908cc09a77a00f8d7c3d4217b46591e112dc1803ff3497ce30e1747bf8c97c691162a41276d581138797f862a29243080e8ece9d3f8 SHA512 14c26a10f3493f3b9fc1fe5d3d11591cf4c09d781d1d2cccf5de15d4b5a0108f8780e168c32968338b82c7929cb083cc47aab539c53d140860505ff0e05f9135
27
28 diff --git a/dev-java/flyingsaucer/files/7-itext-2.0.8.patch b/dev-java/flyingsaucer/files/7-itext-2.0.8.patch
29 deleted file mode 100644
30 index 33b4ea37b99..00000000000
31 --- a/dev-java/flyingsaucer/files/7-itext-2.0.8.patch
32 +++ /dev/null
33 @@ -1,61 +0,0 @@
34 -diff -u -r src.old/java/org/xhtmlrenderer/pdf/ITextFSImage.java src/java/org/xhtmlrenderer/pdf/ITextFSImage.java
35 ---- src.old/java/org/xhtmlrenderer/pdf/ITextFSImage.java 2008-10-23 19:46:53.000000000 +0300
36 -+++ src/java/org/xhtmlrenderer/pdf/ITextFSImage.java 2008-10-23 19:48:05.000000000 +0300
37 -@@ -31,11 +31,11 @@
38 - }
39 -
40 - public int getWidth() {
41 -- return (int)_image.plainWidth();
42 -+ return (int)_image.getPlainWidth();
43 - }
44 -
45 - public int getHeight() {
46 -- return (int)_image.plainHeight();
47 -+ return (int)_image.getPlainHeight();
48 - }
49 -
50 - public void scale(int width, int height) {
51 -diff -u -r src.old/java/org/xhtmlrenderer/pdf/ITextRenderer.java src/java/org/xhtmlrenderer/pdf/ITextRenderer.java
52 ---- src.old/java/org/xhtmlrenderer/pdf/ITextRenderer.java 2008-10-23 19:46:53.000000000 +0300
53 -+++ src/java/org/xhtmlrenderer/pdf/ITextRenderer.java 2008-10-23 19:48:56.000000000 +0300
54 -@@ -234,7 +234,7 @@
55 -
56 - _outputDevice.start(_doc);
57 - _outputDevice.setWriter(writer);
58 -- _outputDevice.initializePage(writer.getDirectContent(), firstPageSize.height());
59 -+ _outputDevice.initializePage(writer.getDirectContent(), firstPageSize.getHeight());
60 -
61 - _root.getLayer().assignPagePaintingPositions(c, Layer.PAGED_MODE_PRINT);
62 -
63 -@@ -254,7 +254,7 @@
64 - doc.setPageSize(nextPageSize);
65 - doc.newPage();
66 - _outputDevice.initializePage(
67 -- writer.getDirectContent(), nextPageSize.height());
68 -+ writer.getDirectContent(), nextPageSize.getHeight());
69 - }
70 - }
71 -
72 -diff -u -r src.old/java/org/xhtmlrenderer/pdf/ITextUserAgent.java src/java/org/xhtmlrenderer/pdf/ITextUserAgent.java
73 ---- src.old/java/org/xhtmlrenderer/pdf/ITextUserAgent.java 2008-10-23 19:46:53.000000000 +0300
74 -+++ src/java/org/xhtmlrenderer/pdf/ITextUserAgent.java 2008-10-23 19:50:00.000000000 +0300
75 -@@ -60,8 +60,8 @@
76 - PdfReader reader = _outputDevice.getReader(url);
77 - PDFAsImage image = new PDFAsImage(url);
78 - Rectangle rect = reader.getPageSizeWithRotation(1);
79 -- image.setInitialWidth(rect.width()*_outputDevice.getDotsPerPoint());
80 -- image.setInitialHeight(rect.height()*_outputDevice.getDotsPerPoint());
81 -+ image.setInitialWidth(rect.getWidth()*_outputDevice.getDotsPerPoint());
82 -+ image.setInitialHeight(rect.getHeight()*_outputDevice.getDotsPerPoint());
83 - resource = new ImageResource(image);
84 - } else {
85 - Image image = Image.getInstance(url);
86 -@@ -84,7 +84,7 @@
87 -
88 - private void scaleToOutputResolution(Image image) {
89 - float factor = _sharedContext.getDotsPerPixel();
90 -- image.scaleAbsolute(image.plainWidth() * factor, image.plainHeight() * factor);
91 -+ image.scaleAbsolute(image.getPlainWidth() * factor, image.getPlainHeight() * factor);
92 - }
93 -
94 - public SharedContext getSharedContext() {
95
96 diff --git a/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild b/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild
97 deleted file mode 100644
98 index f12bb7a3398..00000000000
99 --- a/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild
100 +++ /dev/null
101 @@ -1,75 +0,0 @@
102 -# Copyright 1999-2014 Gentoo Foundation
103 -# Distributed under the terms of the GNU General Public License v2
104 -
105 -EAPI="5"
106 -
107 -JAVA_PKG_IUSE="doc source"
108 -
109 -inherit java-pkg-2 java-ant-2
110 -
111 -DESCRIPTION="100% Java XHTML+CSS renderer"
112 -HOMEPAGE="https://xhtmlrenderer.dev.java.net/"
113 -SRC_URI="http://www.pdoubleya.com/projects/${PN}/downloads/r${PV}/${PN}-R${PV}final-src.zip"
114 -
115 -LICENSE="LGPL-2.1"
116 -SLOT="0"
117 -KEYWORDS="amd64 x86"
118 -
119 -IUSE="minimal svg ${JAVA_PKG_IUSE}"
120 -
121 -COMMON_DEP="
122 - >=dev-java/itext-2.0.8:0
123 - svg? ( dev-java/svgsalamander:0 )"
124 -
125 -# 1.5 because svgsalamander is 1.5
126 -RDEPEND="
127 - svg? ( >=virtual/jre-1.5 )
128 - !svg? ( >=virtual/jre-1.4 )
129 - ${COMMON_DEP}"
130 -
131 -DEPEND="
132 - svg? ( >=virtual/jdk-1.5 )
133 - !svg? ( >=virtual/jdk-1.4 )
134 - app-arch/unzip
135 - ${COMMON_DEP}"
136 -
137 -S="${WORKDIR}"
138 -
139 -java_prepare() {
140 - epatch "${FILESDIR}"/7-itext-2.0.8.patch
141 -
142 - # Save lib/minium.jar because it's not publicly available although it's in
143 - # public domain, will separate if something else needs it
144 - rm -v lib/itext*.jar lib/dev/*.jar lib/dev/*/*.jar || die
145 -
146 - cd lib || die
147 - java-pkg_jar-from itext
148 -
149 - if use svg; then
150 - java-pkg_jar-from svgsalamander
151 - EANT_BUILD_TARGET+=" jar.svg"
152 - fi
153 -
154 - use minimal || EANT_BUILD_TARGET=" jar.docbook jar.about jar.browser"
155 -}
156 -
157 -# Investigate building demos/photogallery demos/filebrowser because
158 -# the files seem to be missing for jar.photogaller jar.filebrowser
159 -EANT_BUILD_TARGET="jar.core"
160 -EANT_DOC_TARGET="docs"
161 -
162 -RESTRICT="test"
163 -
164 -# Needs X11.
165 -src_test() {
166 - eant test -Djava.awt.headless=true
167 -}
168 -
169 -src_install() {
170 - java-pkg_dojar build/*.jar lib/minium.jar
171 -
172 - dodoc README || die
173 -
174 - use doc && java-pkg_dojavadoc doc/user/api
175 - use source && java-pkg_dosrc src/java/org
176 -}
177
178 diff --git a/dev-java/flyingsaucer/metadata.xml b/dev-java/flyingsaucer/metadata.xml
179 deleted file mode 100644
180 index 41a479ba55e..00000000000
181 --- a/dev-java/flyingsaucer/metadata.xml
182 +++ /dev/null
183 @@ -1,14 +0,0 @@
184 -<?xml version="1.0" encoding="UTF-8"?>
185 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
186 -<pkgmetadata>
187 - <maintainer type="project">
188 - <email>java@g.o</email>
189 - <name>Java</name>
190 - </maintainer>
191 -
192 - <longdescription lang="en">
193 - Flying Saucer is a 100% Java XHTML+CSS renderer, including support
194 - for table pagination, margin boxes, running elements, named pages,
195 - and more.
196 - </longdescription>
197 -</pkgmetadata>
198
199 diff --git a/profiles/package.mask b/profiles/package.mask
200 index 05fea028956..dec20ebc570 100644
201 --- a/profiles/package.mask
202 +++ b/profiles/package.mask
203 @@ -1171,7 +1171,6 @@ dev-java/logback
204 # open sec bug #607720, unmaintained
205 # Removal in 30 days
206 dev-java/svgsalamander
207 -dev-java/flyingsaucer
208
209 # Mike Gilbert <floppym@g.o> (2019-08-13)
210 # Dev channel releases are only for people who