From 80d15535304937e3110d3fa93e4fd137416025d8 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Fri, 4 Nov 2016 14:10:04 +0100
Subject: media-video/aacskeys: Rebump to EAPI-6. Added sub-slot dep for
 openssl.

Code cleanup.

Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
 media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild     | 45 ++++++++++++++++++++++
 media-video/aacskeys/aacskeys-0.4.0e.ebuild        | 35 -----------------
 .../files/aacskeys-0.4.0c-aacskeys-makefile.patch  |  4 +-
 .../aacskeys-0.4.0c-libaacskeys-makefile.patch     |  4 +-
 4 files changed, 49 insertions(+), 39 deletions(-)
 create mode 100644 media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild
 delete mode 100644 media-video/aacskeys/aacskeys-0.4.0e.ebuild

diff --git a/media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild b/media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild
new file mode 100644
index 000000000000..dc8a01121f34
--- /dev/null
+++ b/media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/aacskeys-0.4.0e.ebuild b/media-video/aacskeys/aacskeys-0.4.0e.ebuild
deleted file mode 100644
index 3a49f44e46d7..000000000000
--- a/media-video/aacskeys/aacskeys-0.4.0e.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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}/${PN}-0.4.0c-aacskeys-makefile.patch"
-	epatch "${FILESDIR}/${PN}-0.4.0c-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/files/aacskeys-0.4.0c-aacskeys-makefile.patch b/media-video/aacskeys/files/aacskeys-0.4.0c-aacskeys-makefile.patch
index d75932617259..272dcc010819 100644
--- a/media-video/aacskeys/files/aacskeys-0.4.0c-aacskeys-makefile.patch
+++ b/media-video/aacskeys/files/aacskeys-0.4.0c-aacskeys-makefile.patch
@@ -1,5 +1,5 @@
---- aacskeys.make.orig	2010-02-16 18:43:07.000000000 -0700
-+++ aacskeys.make	2010-02-16 18:44:10.000000000 -0700
+--- a/aacskeys.make
++++ b/aacskeys.make
 @@ -13,12 +13,12 @@
    LIBDIR := .
    OBJDIR := obj/linux/Release
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
index 8062a5b60c40..2d5e6cc2431a 100644
--- a/media-video/aacskeys/files/aacskeys-0.4.0c-libaacskeys-makefile.patch
+++ b/media-video/aacskeys/files/aacskeys-0.4.0c-libaacskeys-makefile.patch
@@ -1,5 +1,5 @@
---- libaacskeys.make.orig	2010-02-16 18:37:31.000000000 -0700
-+++ libaacskeys.make	2010-02-16 18:40:15.000000000 -0700
+--- a/libaacskeys.make
++++ b/libaacskeys.make
 @@ -13,12 +13,12 @@
    LIBDIR := .
    OBJDIR := obj/linux/ReleaseLib
-- 
cgit v1.2.3-65-gdbad