From ecdb762e59f8c32806c22d1ba57df1aa6b5092af Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sat, 14 Sep 2019 17:24:45 +0200
Subject: [PATCH] dev-java/logback: Remove last-rited pkg
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Bug: https://bugs.gentoo.org/612914
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-java/logback/Manifest                 |  2 -
 dev-java/logback/logback-1.0.13-r1.ebuild | 61 -----------------------
 dev-java/logback/metadata.xml             | 11 ----
 profiles/package.mask                     |  5 --
 4 files changed, 79 deletions(-)
 delete mode 100644 dev-java/logback/Manifest
 delete mode 100644 dev-java/logback/logback-1.0.13-r1.ebuild
 delete mode 100644 dev-java/logback/metadata.xml

diff --git a/dev-java/logback/Manifest b/dev-java/logback/Manifest
deleted file mode 100644
index 7da8054345e9..000000000000
--- a/dev-java/logback/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST logback-1.0.13-build.tar.bz2 2079 BLAKE2B 5c18656eaaadc1b066a006c3ea6e8a11d637aa6fbf7f2a9763176f30ac4138a2ee6a53baa6d9d64149efd4ef943697b2dbdb578d6c9039210fee2ede0eeb8638 SHA512 4d5a4385f427dbb6a0897459ab6d691c4b77460ea667d7e7a05e2f353730ef78ff712b1c0538e5c5f04fa4daf6605ca1da2dc1b9d0a35741192236b40e44d81e
-DIST logback-1.0.13.tar.gz 6989078 BLAKE2B 3576f7739e90026a9f32bb576f7e692921fde9831b7ce7cb004e36f56650ef8ba63b7d15bf4835b64ea30787586d31a419763d34fcfdcc401d1e4f0b0ca8e7dd SHA512 974cdb6ba77c4654fa3f3bd6e7526eacfd6cf6369118e37436e441ac7742b0e98e4de49af4677cb0524b571639843059c6252751b2eeca58a39d6e9a12aa3814
diff --git a/dev-java/logback/logback-1.0.13-r1.ebuild b/dev-java/logback/logback-1.0.13-r1.ebuild
deleted file mode 100644
index c69c601b1d1b..000000000000
--- a/dev-java/logback/logback-1.0.13-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A generic, reliable, fast & flexible logging framework for Java"
-HOMEPAGE="http://logback.qos.ch/"
-SRC_URI="http://logback.qos.ch/dist/${PN}-${PV}.tar.gz
-		https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}-build.tar.bz2"
-
-LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="tomcat"
-
-CDEPEND="
-	dev-java/jansi:0
-	dev-java/janino:0
-	dev-java/slf4j-api:0
-	dev-java/oracle-javamail:0
-	java-virtuals/servlet-api:3.0
-	tomcat? ( www-servers/tomcat:7 )
-"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-	jansi
-	janino
-	slf4j-api
-	oracle-javamail
-	servlet-api-3.0
-"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-core/target/${PN}-core.jar"
-
-java_prepare() {
-	find "${S}" -name "*.jar" -delete || die
-
-	use tomcat || rm -r "${S}"/${PN}-access/src/main/java/ch/qos/logback/access/tomcat/ || die
-	# remove the next line when we have jetty in the tree
-	rm -r "${S}"/${PN}-access/src/main/java/ch/qos/logback/access/jetty/ || die
-
-	use tomcat && EANT_GENTOO_CLASSPATH+=",tomcat-7"
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/${PN}-core/target/${PN}-core.jar
-	java-pkg_dojar "${S}"/${PN}-access/target/${PN}-access.jar
-
-	use source && java-pkg_dosrc "${S}"/${PN}-core/src/main/java "${S}"/${PN}-access/src/main/java
-	use doc && java-pkg_dojavadoc "${S}"/${PN}-core/target/site/apidocs
-	use examples && java-pkg_doexamples "${S}"/${PN}-examples/src/main/java/chapters/*
-}
diff --git a/dev-java/logback/metadata.xml b/dev-java/logback/metadata.xml
deleted file mode 100644
index 22f9cc83879f..000000000000
--- a/dev-java/logback/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<use>
-		<flag name="tomcat">Builds Apache Tomcat support</flag>
-	</use>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 1ac2224b14fa..34bfedf21415 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1162,11 +1162,6 @@ dev-java/netbeans-webcommon
 dev-java/netbeans-websvccommon
 dev-util/netbeans
 
-# Aaron Bauman <bman@gentoo.org> (2019-08-14)
-# open sec bug #612914, unmaintained
-# Removal in 30 days
-dev-java/logback
-
 # Mike Gilbert <floppym@gentoo.org> (2019-08-13)
 # Dev channel releases are only for people who
 # are developers or want more experimental features
-- 
2.26.2