1 |
commit: ecdb762e59f8c32806c22d1ba57df1aa6b5092af |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 14 15:24:45 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 14 15:25:59 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecdb762e |
7 |
|
8 |
dev-java/logback: Remove last-rited pkg |
9 |
|
10 |
Bug: https://bugs.gentoo.org/612914 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
dev-java/logback/Manifest | 2 - |
14 |
dev-java/logback/logback-1.0.13-r1.ebuild | 61 ------------------------------- |
15 |
dev-java/logback/metadata.xml | 11 ------ |
16 |
profiles/package.mask | 5 --- |
17 |
4 files changed, 79 deletions(-) |
18 |
|
19 |
diff --git a/dev-java/logback/Manifest b/dev-java/logback/Manifest |
20 |
deleted file mode 100644 |
21 |
index 7da8054345e..00000000000 |
22 |
--- a/dev-java/logback/Manifest |
23 |
+++ /dev/null |
24 |
@@ -1,2 +0,0 @@ |
25 |
-DIST logback-1.0.13-build.tar.bz2 2079 BLAKE2B 5c18656eaaadc1b066a006c3ea6e8a11d637aa6fbf7f2a9763176f30ac4138a2ee6a53baa6d9d64149efd4ef943697b2dbdb578d6c9039210fee2ede0eeb8638 SHA512 4d5a4385f427dbb6a0897459ab6d691c4b77460ea667d7e7a05e2f353730ef78ff712b1c0538e5c5f04fa4daf6605ca1da2dc1b9d0a35741192236b40e44d81e |
26 |
-DIST logback-1.0.13.tar.gz 6989078 BLAKE2B 3576f7739e90026a9f32bb576f7e692921fde9831b7ce7cb004e36f56650ef8ba63b7d15bf4835b64ea30787586d31a419763d34fcfdcc401d1e4f0b0ca8e7dd SHA512 974cdb6ba77c4654fa3f3bd6e7526eacfd6cf6369118e37436e441ac7742b0e98e4de49af4677cb0524b571639843059c6252751b2eeca58a39d6e9a12aa3814 |
27 |
|
28 |
diff --git a/dev-java/logback/logback-1.0.13-r1.ebuild b/dev-java/logback/logback-1.0.13-r1.ebuild |
29 |
deleted file mode 100644 |
30 |
index c69c601b1d1..00000000000 |
31 |
--- a/dev-java/logback/logback-1.0.13-r1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,61 +0,0 @@ |
34 |
-# Copyright 1999-2017 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=5 |
38 |
- |
39 |
-JAVA_PKG_IUSE="doc source examples" |
40 |
- |
41 |
-inherit java-pkg-2 java-ant-2 |
42 |
- |
43 |
-DESCRIPTION="A generic, reliable, fast & flexible logging framework for Java" |
44 |
-HOMEPAGE="http://logback.qos.ch/" |
45 |
-SRC_URI="http://logback.qos.ch/dist/${PN}-${PV}.tar.gz |
46 |
- https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}-build.tar.bz2" |
47 |
- |
48 |
-LICENSE="|| ( EPL-1.0 LGPL-2.1 )" |
49 |
-SLOT="0" |
50 |
-KEYWORDS="amd64 ~x86" |
51 |
-IUSE="tomcat" |
52 |
- |
53 |
-CDEPEND=" |
54 |
- dev-java/jansi:0 |
55 |
- dev-java/janino:0 |
56 |
- dev-java/slf4j-api:0 |
57 |
- dev-java/oracle-javamail:0 |
58 |
- java-virtuals/servlet-api:3.0 |
59 |
- tomcat? ( www-servers/tomcat:7 ) |
60 |
-" |
61 |
- |
62 |
-RDEPEND="${CDEPEND} |
63 |
- >=virtual/jre-1.6" |
64 |
-DEPEND="${CDEPEND} |
65 |
- >=virtual/jdk-1.6" |
66 |
- |
67 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
68 |
-EANT_GENTOO_CLASSPATH=" |
69 |
- jansi |
70 |
- janino |
71 |
- slf4j-api |
72 |
- oracle-javamail |
73 |
- servlet-api-3.0 |
74 |
-" |
75 |
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-core/target/${PN}-core.jar" |
76 |
- |
77 |
-java_prepare() { |
78 |
- find "${S}" -name "*.jar" -delete || die |
79 |
- |
80 |
- use tomcat || rm -r "${S}"/${PN}-access/src/main/java/ch/qos/logback/access/tomcat/ || die |
81 |
- # remove the next line when we have jetty in the tree |
82 |
- rm -r "${S}"/${PN}-access/src/main/java/ch/qos/logback/access/jetty/ || die |
83 |
- |
84 |
- use tomcat && EANT_GENTOO_CLASSPATH+=",tomcat-7" |
85 |
-} |
86 |
- |
87 |
-src_install() { |
88 |
- java-pkg_dojar "${S}"/${PN}-core/target/${PN}-core.jar |
89 |
- java-pkg_dojar "${S}"/${PN}-access/target/${PN}-access.jar |
90 |
- |
91 |
- use source && java-pkg_dosrc "${S}"/${PN}-core/src/main/java "${S}"/${PN}-access/src/main/java |
92 |
- use doc && java-pkg_dojavadoc "${S}"/${PN}-core/target/site/apidocs |
93 |
- use examples && java-pkg_doexamples "${S}"/${PN}-examples/src/main/java/chapters/* |
94 |
-} |
95 |
|
96 |
diff --git a/dev-java/logback/metadata.xml b/dev-java/logback/metadata.xml |
97 |
deleted file mode 100644 |
98 |
index 22f9cc83879..00000000000 |
99 |
--- a/dev-java/logback/metadata.xml |
100 |
+++ /dev/null |
101 |
@@ -1,11 +0,0 @@ |
102 |
-<?xml version="1.0" encoding="UTF-8"?> |
103 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
104 |
-<pkgmetadata> |
105 |
- <maintainer type="project"> |
106 |
- <email>java@g.o</email> |
107 |
- <name>Java</name> |
108 |
- </maintainer> |
109 |
- <use> |
110 |
- <flag name="tomcat">Builds Apache Tomcat support</flag> |
111 |
- </use> |
112 |
-</pkgmetadata> |
113 |
|
114 |
diff --git a/profiles/package.mask b/profiles/package.mask |
115 |
index 1ac2224b14f..34bfedf2141 100644 |
116 |
--- a/profiles/package.mask |
117 |
+++ b/profiles/package.mask |
118 |
@@ -1162,11 +1162,6 @@ dev-java/netbeans-webcommon |
119 |
dev-java/netbeans-websvccommon |
120 |
dev-util/netbeans |
121 |
|
122 |
-# Aaron Bauman <bman@g.o> (2019-08-14) |
123 |
-# open sec bug #612914, unmaintained |
124 |
-# Removal in 30 days |
125 |
-dev-java/logback |
126 |
- |
127 |
# Mike Gilbert <floppym@g.o> (2019-08-13) |
128 |
# Dev channel releases are only for people who |
129 |
# are developers or want more experimental features |