Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/iroffer-dinoex/, dev-java/jcs/, dev-java/jcs/files/, ...
Date: Sat, 02 Mar 2019 07:31:17
Message-Id: 1551511862.25a641de5b76d485ce14da3afdf869c8a9016c71.zlogene@gentoo
1 commit: 25a641de5b76d485ce14da3afdf869c8a9016c71
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 2 07:28:11 2019 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 2 07:31:02 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a641de
7
8 dev-java/jcs: remove last-rited package
9
10 Closes: https://bugs.gentoo.org/671240
11
12 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
13
14 dev-java/jcs/Manifest | 1 -
15 dev-java/jcs/files/jcs-2.0-build.xml | 306 ---------------------
16 dev-java/jcs/jcs-2.0.ebuild | 96 -------
17 dev-java/jcs/metadata.xml | 11 -
18 net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild | 2 +-
19 .../gentoo-sources/gentoo-sources-4.14.101.ebuild | 2 +-
20 .../gentoo-sources/gentoo-sources-4.19.23.ebuild | 2 +-
21 .../gentoo-sources/gentoo-sources-4.4.174.ebuild | 2 +-
22 .../gentoo-sources/gentoo-sources-4.9.158.ebuild | 2 +-
23 9 files changed, 5 insertions(+), 419 deletions(-)
24
25 diff --git a/dev-java/jcs/Manifest b/dev-java/jcs/Manifest
26 deleted file mode 100644
27 index cf5da0cf8d5..00000000000
28 --- a/dev-java/jcs/Manifest
29 +++ /dev/null
30 @@ -1 +0,0 @@
31 -DIST commons-jcs-dist-2.0-beta-1-src.tar.gz 825048 BLAKE2B e99ed509d790e600bed762358f1f52779daec1a1dc2b6245ed9a39660400be0cea8546f02e6478bfeefdd2476409efeeed012cba705eeb0f71a31668f242284a SHA512 56d68807de6d47debc893584a738bc797c2a150503ae460dc1444e9434b438926f6ad9fe8c1292250f6a0b2936210084cbd512083b5a8cc4f20e692b759a314f
32
33 diff --git a/dev-java/jcs/files/jcs-2.0-build.xml b/dev-java/jcs/files/jcs-2.0-build.xml
34 deleted file mode 100644
35 index 04c4dae8172..00000000000
36 --- a/dev-java/jcs/files/jcs-2.0-build.xml
37 +++ /dev/null
38 @@ -1,306 +0,0 @@
39 -<?xml version="1.0" encoding="UTF-8"?>
40 -
41 -<!-- ====================================================================== -->
42 -<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
43 -<!-- ====================================================================== -->
44 -
45 -<!-- ====================================================================== -->
46 -<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
47 -<!-- ====================================================================== -->
48 -<!-- -->
49 -<!-- Any modifications will be overwritten. -->
50 -<!-- -->
51 -<!-- Generated by Maven Ant Plugin on 6/14/15 12:02 AM -->
52 -<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
53 -<!-- -->
54 -<!-- ====================================================================== -->
55 -
56 -<project name="commons-jcs-core-from-maven" default="package" basedir=".">
57 -
58 - <!-- ====================================================================== -->
59 - <!-- Build environment properties -->
60 - <!-- ====================================================================== -->
61 -
62 - <property file="${user.home}/.m2/maven.properties"/>
63 - <property file="maven-build.properties"/>
64 -
65 - <property name="maven.build.finalName" value="commons-jcs-core-2.0-beta-1"/>
66 - <property name="maven.build.dir" value="target"/>
67 - <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
68 - <property name="maven.build.srcDir.0" value="src/main/java"/>
69 - <property name="maven.build.resourceDir.0" value="src/main/resources"/>
70 - <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
71 - <property name="maven.build.testDir.0" value="src/test/java"/>
72 - <property name="maven.build.testResourceDir.0" value="src/test/test-conf"/>
73 - <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
74 - <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
75 -
76 - <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
77 - <property name="maven.settings.offline" value="false"/>
78 - <property name="maven.settings.interactiveMode" value="true"/>
79 -
80 - <!-- ====================================================================== -->
81 - <!-- Defining classpaths -->
82 - <!-- ====================================================================== -->
83 -
84 - <path id="build.classpath">
85 - <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
86 - <pathelement location="${maven.repo.local}/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"/>
87 - <pathelement location="${maven.repo.local}/commons-pool/commons-pool/1.6/commons-pool-1.6.jar"/>
88 - <pathelement location="${maven.repo.local}/hsqldb/hsqldb/1.8.0.10/hsqldb-1.8.0.10.jar"/>
89 - <pathelement location="${maven.repo.local}/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar"/>
90 - <pathelement location="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
91 - <pathelement location="${maven.repo.local}/commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
92 - <pathelement location="${maven.repo.local}/commons-chain/commons-chain/1.1/commons-chain-1.1.jar"/>
93 - <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
94 - <pathelement location="${maven.repo.local}/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar"/>
95 - <pathelement location="${maven.repo.local}/dom4j/dom4j/1.1/dom4j-1.1.jar"/>
96 - <pathelement location="${maven.repo.local}/oro/oro/2.0.8/oro-2.0.8.jar"/>
97 - <pathelement location="${maven.repo.local}/sslext/sslext/1.2-0/sslext-1.2-0.jar"/>
98 - <pathelement location="${maven.repo.local}/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar"/>
99 - <pathelement location="${maven.repo.local}/antlr/antlr/2.7.2/antlr-2.7.2.jar"/>
100 - <pathelement location="${maven.repo.local}/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar"/>
101 - <pathelement location="${maven.repo.local}/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar"/>
102 - <pathelement location="${maven.repo.local}/org/apache/velocity/velocity/1.6.2/velocity-1.6.2.jar"/>
103 - <pathelement location="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/>
104 - <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
105 - <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
106 - <pathelement location="${maven.repo.local}/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
107 - </path>
108 - <path id="build.test.classpath">
109 - <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
110 - <pathelement location="${maven.repo.local}/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"/>
111 - <pathelement location="${maven.repo.local}/commons-pool/commons-pool/1.6/commons-pool-1.6.jar"/>
112 - <pathelement location="${maven.repo.local}/hsqldb/hsqldb/1.8.0.10/hsqldb-1.8.0.10.jar"/>
113 - <pathelement location="${maven.repo.local}/org/apache/commons/commons-collections4/4.0/commons-collections4-4.0.jar"/>
114 - <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
115 - <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
116 - <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.jar"/>
117 - <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
118 - <pathelement location="${maven.repo.local}/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar"/>
119 - <pathelement location="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
120 - <pathelement location="${maven.repo.local}/commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
121 - <pathelement location="${maven.repo.local}/commons-chain/commons-chain/1.1/commons-chain-1.1.jar"/>
122 - <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
123 - <pathelement location="${maven.repo.local}/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar"/>
124 - <pathelement location="${maven.repo.local}/dom4j/dom4j/1.1/dom4j-1.1.jar"/>
125 - <pathelement location="${maven.repo.local}/oro/oro/2.0.8/oro-2.0.8.jar"/>
126 - <pathelement location="${maven.repo.local}/sslext/sslext/1.2-0/sslext-1.2-0.jar"/>
127 - <pathelement location="${maven.repo.local}/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar"/>
128 - <pathelement location="${maven.repo.local}/antlr/antlr/2.7.2/antlr-2.7.2.jar"/>
129 - <pathelement location="${maven.repo.local}/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar"/>
130 - <pathelement location="${maven.repo.local}/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar"/>
131 - <pathelement location="${maven.repo.local}/org/apache/velocity/velocity/1.6.2/velocity-1.6.2.jar"/>
132 - <pathelement location="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/>
133 - <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
134 - <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
135 - <pathelement location="${maven.repo.local}/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
136 - </path>
137 -
138 - <!-- ====================================================================== -->
139 - <!-- Cleaning up target -->
140 - <!-- ====================================================================== -->
141 -
142 - <target name="clean" description="Clean the output directory">
143 - <delete dir="${maven.build.dir}"/>
144 - </target>
145 -
146 - <!-- ====================================================================== -->
147 - <!-- Compilation target -->
148 - <!-- ====================================================================== -->
149 -
150 - <target name="compile" description="Compile the code">
151 - <mkdir dir="${maven.build.outputDir}"/>
152 - <javac destdir="${maven.build.outputDir}"
153 - encoding="UTF-8"
154 - nowarn="false"
155 - debug="true"
156 - optimize="false"
157 - deprecation="true"
158 - target="1.6"
159 - verbose="false"
160 - fork="false"
161 - source="1.6">
162 - <src>
163 - <pathelement location="${maven.build.srcDir.0}"/>
164 - </src>
165 - <classpath refid="build.classpath"/>
166 - </javac>
167 - <mkdir dir="${maven.build.outputDir}//var/tmp/portage/dev-java/jcs-2.0/work/commons-jcs-dist-2.0-beta-1-src/commons-jcs-core/target/classes"/>
168 - <copy todir="${maven.build.outputDir}//var/tmp/portage/dev-java/jcs-2.0/work/commons-jcs-dist-2.0-beta-1-src/commons-jcs-core/target/classes">
169 - <fileset dir="${maven.build.resourceDir.0}"/>
170 - </copy>
171 - </target>
172 -
173 - <!-- ====================================================================== -->
174 - <!-- Test-compilation target -->
175 - <!-- ====================================================================== -->
176 -
177 - <target name="compile-tests"
178 - description="Compile the test code"
179 - unless="maven.test.skip">
180 - <mkdir dir="${maven.build.testOutputDir}"/>
181 - <javac destdir="${maven.build.testOutputDir}"
182 - encoding="UTF-8"
183 - nowarn="false"
184 - debug="true"
185 - optimize="false"
186 - deprecation="true"
187 - target="1.6"
188 - verbose="false"
189 - fork="false"
190 - source="1.6">
191 - <src>
192 - <pathelement location="${maven.build.testDir.0}"/>
193 - </src>
194 - <classpath>
195 - <path refid="build.test.classpath"/>
196 - <pathelement location="${maven.build.outputDir}"/>
197 - </classpath>
198 - </javac>
199 - <copy todir="${maven.build.testOutputDir}">
200 - <fileset dir="${maven.build.testResourceDir.0}">
201 - <include name="**/*.properties"/>
202 - <include name="**/*.ccf"/>
203 - </fileset>
204 - </copy>
205 - </target>
206 -
207 - <!-- ====================================================================== -->
208 - <!-- Run all tests -->
209 - <!-- ====================================================================== -->
210 -
211 - <target name="test"
212 - depends="compile-tests, junit-missing"
213 - unless="junit.skipped"
214 - description="Run the test cases">
215 - <mkdir dir="${maven.test.reports}"/>
216 - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
217 - <sysproperty key="basedir" value="."/>
218 - <formatter type="xml"/>
219 - <formatter type="plain" usefile="false"/>
220 - <classpath>
221 - <path refid="build.test.classpath"/>
222 - <pathelement location="${maven.build.outputDir}"/>
223 - <pathelement location="${maven.build.testOutputDir}"/>
224 - </classpath>
225 - <batchtest todir="${maven.test.reports}" unless="test">
226 - <fileset dir="${maven.build.testDir.0}">
227 - <include name="**/*UnitTest.java"/>
228 - <exclude name="**/BlockDiskElementDescriptorUnitTest.java"/>
229 - <exclude name="**/HSQLDiskCacheConcurrentUnitTest.java"/>
230 - <exclude name="**/HSQLDiskCacheUnitTest.java"/>
231 - <exclude name="**/IndexedDiskCacheOptimizationUnitTest.java"/>
232 - <exclude name="**/TestTCPLateralUnitTest.java"/>
233 - <exclude name="**/UDPDiscoveryUnitTest.java"/>
234 - <exclude name="**/UDPDiscoverySenderUnitTest.java"/>
235 - </fileset>
236 - </batchtest>
237 - <batchtest todir="${maven.test.reports}" if="test">
238 - <fileset dir="${maven.build.testDir.0}">
239 - <include name="**/${test}.java"/>
240 - <exclude name="**/BlockDiskElementDescriptorUnitTest.java"/>
241 - <exclude name="**/HSQLDiskCacheConcurrentUnitTest.java"/>
242 - <exclude name="**/HSQLDiskCacheUnitTest.java"/>
243 - <exclude name="**/IndexedDiskCacheOptimizationUnitTest.java"/>
244 - <exclude name="**/TestTCPLateralUnitTest.java"/>
245 - <exclude name="**/UDPDiscoveryUnitTest.java"/>
246 - <exclude name="**/UDPDiscoverySenderUnitTest.java"/>
247 - </fileset>
248 - </batchtest>
249 - </junit>
250 - </target>
251 -
252 - <target name="test-junit-present">
253 - <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
254 - </target>
255 -
256 - <target name="test-junit-status"
257 - depends="test-junit-present">
258 - <condition property="junit.missing">
259 - <and>
260 - <isfalse value="${junit.present}"/>
261 - <isfalse value="${maven.test.skip}"/>
262 - </and>
263 - </condition>
264 - <condition property="junit.skipped">
265 - <or>
266 - <isfalse value="${junit.present}"/>
267 - <istrue value="${maven.test.skip}"/>
268 - </or>
269 - </condition>
270 - </target>
271 -
272 - <target name="junit-missing"
273 - depends="test-junit-status"
274 - if="junit.missing">
275 - <echo>=================================== WARNING ===================================</echo>
276 - <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
277 - <echo>===============================================================================</echo>
278 - </target>
279 -
280 - <!-- ====================================================================== -->
281 - <!-- Javadoc target -->
282 - <!-- ====================================================================== -->
283 -
284 - <target name="javadoc" description="Generates the Javadoc of the application">
285 - <javadoc sourcepath="${maven.build.srcDir.0}"
286 - packagenames="*"
287 - destdir="${maven.reporting.outputDirectory}/apidocs"
288 - access="protected"
289 - old="false"
290 - verbose="false"
291 - encoding="UTF-8"
292 - version="true"
293 - use="true"
294 - author="true"
295 - splitindex="false"
296 - nodeprecated="false"
297 - nodeprecatedlist="false"
298 - notree="false"
299 - noindex="false"
300 - nohelp="false"
301 - nonavbar="false"
302 - serialwarn="false"
303 - charset="ISO-8859-1"
304 - docencoding="UTF-8"
305 - source="1.6"
306 - linksource="true"
307 - breakiterator="false">
308 - <link href="http://docs.oracle.com/javase/6/docs/api/"/>
309 - <link href="http://docs.oracle.com/javaee/6/api/"/>
310 - </javadoc>
311 - </target>
312 -
313 - <!-- ====================================================================== -->
314 - <!-- Package target -->
315 - <!-- ====================================================================== -->
316 -
317 - <target name="package" depends="compile" description="Package the application">
318 - <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
319 - compress="true"
320 - index="false"
321 - basedir="${maven.build.outputDir}"
322 - excludes="**/package.html">
323 - <manifest>
324 - <attribute name="Main-Class" value="Main"/>
325 - </manifest>
326 - </jar>
327 - </target>
328 -
329 - <!-- ====================================================================== -->
330 - <!-- A dummy target for the package named after the type it creates -->
331 - <!-- ====================================================================== -->
332 -
333 - <target name="jar" depends="package" description="Builds the jar for the application"/>
334 -
335 - <!-- ====================================================================== -->
336 - <!-- Download dependencies target -->
337 - <!-- ====================================================================== -->
338 -
339 - <target name="test-offline">
340 - <condition property="maven.mode.offline">
341 - <equals arg1="${maven.settings.offline}" arg2="true"/>
342 - </condition>
343 - </target>
344 -</project>
345
346 diff --git a/dev-java/jcs/jcs-2.0.ebuild b/dev-java/jcs/jcs-2.0.ebuild
347 deleted file mode 100644
348 index f79f0dded21..00000000000
349 --- a/dev-java/jcs/jcs-2.0.ebuild
350 +++ /dev/null
351 @@ -1,96 +0,0 @@
352 -# Copyright 1999-2017 Gentoo Foundation
353 -# Distributed under the terms of the GNU General Public License v2
354 -
355 -EAPI=5
356 -JAVA_PKG_IUSE="test doc source"
357 -
358 -inherit java-pkg-2 java-ant-2
359 -
360 -MY_P="commons-${PN}-dist-${PV}-beta-1-src"
361 -JCS_CORE="commons-${PN}-core"
362 -
363 -DESCRIPTION="A distributed caching system for server-side Java applications"
364 -HOMEPAGE="http://commons.apache.org/jcs/"
365 -SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/commons/${PN}/source/commons-${PN}-dist-${PV}-beta-1-src.tar.gz"
366 -
367 -LICENSE="Apache-2.0"
368 -SLOT="2.0"
369 -KEYWORDS="amd64 x86"
370 -IUSE="admin"
371 -
372 -CDEPEND="dev-java/jisp:2.5
373 - dev-db/hsqldb:0
374 - dev-java/log4j:0
375 - dev-java/xmlrpc:3
376 - dev-java/commons-lang:0
377 - dev-java/commons-dbcp:0
378 - dev-java/commons-pool:0
379 - dev-java/commons-logging:0
380 - dev-java/commons-httpclient:3
381 - java-virtuals/servlet-api:3.0"
382 -
383 -RDEPEND=">=virtual/jre-1.6
384 - ${CDEPEND}"
385 -DEPEND=">=virtual/jdk-1.6
386 - test? ( dev-java/ant-junit:0 )
387 - ${CDEPEND}"
388 -
389 -S="${WORKDIR}/${MY_P}"
390 -
391 -JAVA_ANT_REWRITE_CLASSPATH="true"
392 -EANT_GENTOO_CLASSPATH="
393 - xmlrpc-3
394 - hsqldb
395 - jisp-2.5
396 - log4j
397 - commons-lang
398 - commons-pool
399 - commons-dbcp
400 - commons-logging
401 - commons-httpclient-3
402 - servlet-api-3.0
403 -"
404 -
405 -EANT_BUILD_XML="${JCS_CORE}/build.xml"
406 -EANT_BUILD_TARGET="package"
407 -
408 -java_prepare() {
409 - cp "${FILESDIR}/${P}-build.xml" ${JCS_CORE}/build.xml
410 -
411 - # Disable the velocity-tools dep.
412 - rm -v \
413 - ${JCS_CORE}/src/main/java/org/apache/commons/jcs/admin/servlet/JCSAdminServlet.java
414 -
415 - if use test; then
416 - # Make use of commons-collections4 not yet packaged in Gentoo
417 - rm -v \
418 - "${JCS_CORE}"/src/test/java/org/apache/commons/jcs/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java \
419 - "${JCS_CORE}"/src/test/java/org/apache/commons/jcs/utils/struct/LRUMapPerformanceTest.java
420 -
421 - # Fails for some reason.
422 - rm -v \
423 - "${JCS_CORE}"/src/test/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheUnitTest.java \
424 - "${JCS_CORE}"/src/test/java/org/apache/commons/jcs/auxiliary/disk/LRUMapJCSUnitTest.java \
425 - "${JCS_CORE}"/src/test/java/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLoggerUnitTest.java \
426 - "${JCS_CORE}"/src/test/java/org/apache/commons/jcs/utils/struct/DoubleLinkedListUnitTest.java
427 - fi
428 -}
429 -
430 -EANT_TEST_TARGET="test"
431 -
432 -src_test() {
433 - java-pkg-2_src_test
434 -}
435 -
436 -src_install() {
437 - local target="${JCS_CORE}"/target
438 - java-pkg_newjar "${target}"/"${JCS_CORE}-${PV}"-beta-1.jar "${JCS_CORE}".jar
439 -
440 - if use doc; then
441 - java-pkg_dojavadoc "${target}"/site/apidocs
442 - fi
443 -
444 - if use source; then
445 - java-pkg_dosrc "${JCS_CORE}"/src
446 - fi
447 -}
448
449 diff --git a/dev-java/jcs/metadata.xml b/dev-java/jcs/metadata.xml
450 deleted file mode 100644
451 index 4946ed2f4b7..00000000000
452 --- a/dev-java/jcs/metadata.xml
453 +++ /dev/null
454 @@ -1,11 +0,0 @@
455 -<?xml version="1.0" encoding="UTF-8"?>
456 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
457 -<pkgmetadata>
458 - <maintainer type="project">
459 - <email>java@g.o</email>
460 - <name>Java</name>
461 - </maintainer>
462 - <use>
463 - <flag name="admin">Enable JCS Admin servlets</flag>
464 - </use>
465 -</pkgmetadata>
466
467 diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild
468 index 2adfa45a9d8..fc2f8874d97 100644
469 --- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild
470 +++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild
471 @@ -15,7 +15,7 @@ SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz
472
473 LICENSE="GPL-2"
474 SLOT="0"
475 -KEYWORDS="~amd64 x86"
476 +KEYWORDS="~amd64 s390 x86"
477 IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp"
478
479 REQUIRED_USE="
480
481 diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.101.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.101.ebuild
482 index a316f36fcfc..735aadc7825 100644
483 --- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.101.ebuild
484 +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.101.ebuild
485 @@ -10,7 +10,7 @@ inherit kernel-2
486 detect_version
487 detect_arch
488
489 -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
490 +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
491 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
492 IUSE="experimental"
493
494
495 diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.23.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.23.ebuild
496 index 693c73cf3b8..b8eda38e0ab 100644
497 --- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.23.ebuild
498 +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.23.ebuild
499 @@ -10,7 +10,7 @@ inherit kernel-2
500 detect_version
501 detect_arch
502
503 -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
504 +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
505 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
506 IUSE="experimental"
507
508
509 diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.174.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.174.ebuild
510 index fa5cf21d099..c7b6346cc18 100644
511 --- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.174.ebuild
512 +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.174.ebuild
513 @@ -10,7 +10,7 @@ inherit kernel-2
514 detect_version
515 detect_arch
516
517 -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
518 +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
519 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
520 IUSE="experimental"
521
522
523 diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.158.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.158.ebuild
524 index 0b1f864490a..f5732f9fa5c 100644
525 --- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.158.ebuild
526 +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.158.ebuild
527 @@ -10,7 +10,7 @@ inherit kernel-2
528 detect_version
529 detect_arch
530
531 -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
532 +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
533 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
534 IUSE="experimental"