7 files changed, 0 insertions, 164 deletions
diff --git a/media-video/aacskeys/Manifest b/media-video/aacskeys/Manifest
deleted file mode 100644
index 04d001a39391..000000000000
--- a/media-video/aacskeys/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST aacskeys-0.4.0c.tar.gz 4118637 BLAKE2B ad6b3b8aff0bc872463ba67ec2c097ff2b743ce2582bed0e1f910b101a1486b2fd2792a090a61786fa68b24e17ecc6ed4b996ffa2b3783139c5df0a26de697a4 SHA512 34c434fd1b118fb301b8af9c20762075bab213b39584e8e33c6b685c7504e4863f78ee2754d131e760c535dd24b29826dc6756833b5deaaa5c4b70ab8f9a6ba8
-DIST aacskeys-0.4.0e.tar.gz 4117374 BLAKE2B b7a5d829a29d652d44a0728d5456f6fdc83d71483504b1cbb2cd547eae12db71f10682b2874b1d6f17a21c5c1f1255e5aff230de02a0d54265ff6ae1abee0f2e SHA512 86435bd4b5ce31cae87390bade631d9dc36814cd5e03fdcaca02eefe3d351432e7ba61f7127f6030b92e929ba3726547d7c04d8558239bd23a32bcb1574b7f6f
diff --git a/media-video/aacskeys/aacskeys-0.4.0c-r2.ebuild b/media-video/aacskeys/aacskeys-0.4.0c-r2.ebuild
deleted file mode 100644
index 7eed7a5ffb04..000000000000
--- a/media-video/aacskeys/aacskeys-0.4.0c-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils java-pkg-2
-
-DESCRIPTION="Decrypt keys from an AACS source (HD DVD / Blu-Ray)"
-HOMEPAGE="http://forum.doom9.org/showthread.php?t=123311"
-SRC_URI="http://bluray.beandog.org/aacskeys/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl[-bindist]"
-DEPEND=">=virtual/jdk-1.6
-	${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-aacskeys-makefile.patch"
-	epatch "${FILESDIR}/${P}-libaacskeys-makefile.patch"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin bin/linux/aacskeys || die
-	dolib lib/linux/libaacskeys.so || die
-	dodoc HostKeyCertificate.txt ProcessingDeviceKeysSimple.txt \
-		README.txt || die
-}
diff --git a/media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild b/media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild
deleted file mode 100644
index a9a91825c350..000000000000
--- a/media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils java-pkg-2
-
-DESCRIPTION="Decrypt keys from an AACS source (HD DVD / Blu-Ray)"
-HOMEPAGE="http://forum.doom9.org/showthread.php?t=123311"
-SRC_URI="http://bluray.beandog.org/aacskeys/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl:0=[-bindist]"
-DEPEND=">=virtual/jdk-1.6
-	${RDEPEND}"
-
-DOCS=(
-	HostKeyCertificate.txt
-	ProcessingDeviceKeysSimple.txt
-	README.txt
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.0c-aacskeys-makefile.patch"
-	"${FILESDIR}/${PN}-0.4.0c-libaacskeys-makefile.patch"
-)
-
-# overriding src_* functions from java-pkg-2 eclass.
-src_prepare() {
-	default
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	dobin bin/linux/aacskeys
-	dolib lib/linux/libaacskeys.so
-	einstalldocs
-}
diff --git a/media-video/aacskeys/files/aacskeys-0.4.0c-aacskeys-makefile.patch b/media-video/aacskeys/files/aacskeys-0.4.0c-aacskeys-makefile.patch
deleted file mode 100644
index 272dcc010819..000000000000
--- a/media-video/aacskeys/files/aacskeys-0.4.0c-aacskeys-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/aacskeys.make
-+++ b/aacskeys.make
-@@ -13,12 +13,12 @@
-   LIBDIR := .
-   OBJDIR := obj/linux/Release
-   OUTDIR := bin/linux
--  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -I "/usr/local/ssl/include"
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Wall -fomit-frame-pointer -O3 -pipe
-+  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -I "/usr/ssl/include"
-+  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH)
-   CXXFLAGS := $(CFLAGS)
--  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -s -L"/usr/local/ssl/lib" -lcrypto
-+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/ssl/lib" -lcrypto
-   LDDEPS :=
--  RESFLAGS := -D "_REENTRANT" -I "/usr/local/ssl/include"
-+  RESFLAGS := -D "_REENTRANT" -I "/usr/ssl/include"
-   TARGET := aacskeys
-   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
- endif
-@@ -28,12 +28,12 @@
-   LIBDIR := .
-   OBJDIR := obj/linux/Debug
-   OUTDIR := bin/linux/debug
--  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "DEBUG" -I "/usr/local/ssl/include"
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -Wall -pipe
-+  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "DEBUG" -I "/usr/ssl/include"
-+  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g
-   CXXFLAGS := $(CFLAGS)
-   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/local/ssl/lib" -lcrypto
-   LDDEPS :=
--  RESFLAGS := -D "_REENTRANT" -D "DEBUG" -I "/usr/local/ssl/include"
-+  RESFLAGS := -D "_REENTRANT" -D "DEBUG" -I "/usr/ssl/include"
-   TARGET := aacskeys
-   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
- endif
diff --git a/media-video/aacskeys/files/aacskeys-0.4.0c-libaacskeys-makefile.patch b/media-video/aacskeys/files/aacskeys-0.4.0c-libaacskeys-makefile.patch
deleted file mode 100644
index 2d5e6cc2431a..000000000000
--- a/media-video/aacskeys/files/aacskeys-0.4.0c-libaacskeys-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/libaacskeys.make
-+++ b/libaacskeys.make
-@@ -13,12 +13,12 @@
-   LIBDIR := .
-   OBJDIR := obj/linux/ReleaseLib
-   OUTDIR := lib/linux
--  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -Wall -fomit-frame-pointer -O3 -pipe
-+  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -I "/usr/ssl/include" -I "/etc/java-config-2/current-system-vm/include" -I "/etc/java-config-2/current-system-vm/include/linux"
-+  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC
-   CXXFLAGS := $(CFLAGS)
--  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -s -L"/usr/local/ssl/lib" -lcrypto
-+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L"/usr/ssl/lib" -lcrypto
-   LDDEPS :=
--  RESFLAGS := -D "_REENTRANT" -D "JNILIB" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
-+  RESFLAGS := -D "_REENTRANT" -D "JNILIB" -I "/usr/ssl/include" -I "/etc/java-config-2/current-system-vm/include" -I "/etc/java-config-2/current-system-vm/include/linux"
-   TARGET := libaacskeys.so
-   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
- endif
-@@ -28,12 +28,12 @@
-   LIBDIR := .
-   OBJDIR := obj/linux/DebugLib
-   OUTDIR := lib/linux/debug
--  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
--  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -g -Wall -pipe
-+  CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/ssl/include" -I "/etc/java-config-2/current-system-vm/include" -I "/etc/java-config-2/current-system-vm/include/linux"
-+  CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -g
-   CXXFLAGS := $(CFLAGS)
--  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L"/usr/local/ssl/lib" -lcrypto
-+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L"/usr/ssl/lib" -lcrypto
-   LDDEPS :=
--  RESFLAGS := -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
-+  RESFLAGS := -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/ssl/include" -I "/etc/java-config-2/current-system-vm/include" -I "/etc/java-config-2/current-system-vm/include/linux"
-   TARGET := libaacskeys.so
-   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
- endif
diff --git a/media-video/aacskeys/metadata.xml b/media-video/aacskeys/metadata.xml
deleted file mode 100644
index 531e97b976d1..000000000000
--- a/media-video/aacskeys/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-  <longdescription lang="en">aacskeys is a program to decrypt all required keys from an AACS protected HD-DVD / Blu-Ray to decrypt it.</longdescription>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index b4171b76c6c5..6b058a6dedf4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -323,11 +323,6 @@ sys-libs/uclibc
 net-libs/webkit-gtk:2
 net-libs/webkit-gtk:3
 
-# Steve Dibb <beandog@gentoo.org> (22 Feb 2018)
-# Dead upstream, long since replaced by libaacs for functionality.
-# Masked for removal in 30 days. Bug #648560
-media-video/aacskeys
-
 # Eray Aslan <eras@gentoo.org> (08 Feb 2018)
 # Mask experimental software
 =mail-mta/postfix-3.4*