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>

diff --git a/media-video/aacskeys/aacskeys-0.4.0e.ebuild b/media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild
similarity index 51%
rename from media-video/aacskeys/aacskeys-0.4.0e.ebuild
rename to media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild
index 3a49f44e46d71f823cdfdfda306c5259d0195feb..dc8a01121f34edeb373384da8609fa337166dd01 100644 (file)
--- a/media-video/aacskeys/aacskeys-0.4.0e.ebuild
+++ b/media-video/aacskeys/aacskeys-0.4.0e-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit eutils java-pkg-2
 
 DESCRIPTION="Decrypt keys from an AACS source (HD DVD / Blu-Ray)"
@@ -14,22 +14,32 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-libs/openssl[-bindist]"
+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() {
-       epatch "${FILESDIR}/${PN}-0.4.0c-aacskeys-makefile.patch"
-       epatch "${FILESDIR}/${PN}-0.4.0c-libaacskeys-makefile.patch"
+       default
 }
 
 src_compile() {
-       emake || die "emake failed"
+       emake
 }
 
 src_install() {
-       dobin bin/linux/aacskeys || die
-       dolib lib/linux/libaacskeys.so || die
-       dodoc HostKeyCertificate.txt ProcessingDeviceKeysSimple.txt \
-               README.txt || die
+       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
index d759326172595b3559095bec80e384173eef1296..272dcc010819a5d92e3040cdf28a296eb5181cc6 100644 (file)
--- 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 8062a5b60c4001e99f6336cf810f7b8d90e0746d..2d5e6cc2431a810d72e61686fe1d5e142426b9a8 100644 (file)
--- 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