gentoo resync : 02.05.2018

3 files changed, 27 insertions, 27 deletions

diff --git a/games-puzzle/pauker/Manifest b/games-puzzle/pauker/Manifest
index b437b9d758e2..9edccff11199 100644
--- a/games-puzzle/pauker/Manifest
+++ b/games-puzzle/pauker/Manifest
@@ -1,4 +1,4 @@
-AUX pauker_bundledjars.patch 899 BLAKE2B 78836ee00e58e24b6404ae5340c542c9ac6947e17bad55f5d983906133f03f1aa9b372288fe372d6ffdee4361f518125953a0dcd1816ab6aaff808eaec4243e5 SHA512 ed7d47165871488233bcf032bf7e93f7988a231251fa93dbf173774dcaecee1adb735930fbface4009a72912db3f811a09cb9e49a038e7c01fda9a44e8515a22
+AUX pauker_bundledjars.patch 903 BLAKE2B 944e338bf1f0b4501ae68accaf44dcb6cd0c286722ac5077ce7748e93c524ff262a4e21fcfd2a576d2dc5c5d7d5ef9e04354e11d6e0b2a4fc9a0f018daf61708 SHA512 fd6d525fb49b956bfcecaf44e8f8044251d91341844418e1980db96bcfc6e91e86ec60aa08d112a84b1fe1c40b87e0429edfdbfaa1ea100993e89eded230bf6e
 DIST pauker-1.8.src.jar 33886665 BLAKE2B 9dddd9f7e5d5dbc9e7bc18b69e708ba3a4ea67e17b513b218eb14a77094fe40ef3d404e8dc85311ee2cd4d69587625828084cfbbf1d05534c90f40948e8ef8f4 SHA512 2d329571e857a05116ba499c4bd82669f0c99a748ca375ab06e701492a814b97fcc09bbf0ae4f48c52b05c67768a14d70a4217fee9680762424c96ab7f4341ae
-EBUILD pauker-1.8.ebuild 1797 BLAKE2B d08ad0eaad6098db13bff12dd29dfdd74319006dfb4ae819117179aec543af1715193f7f84b3cdc1485cb311bb780da4581c15ae683c6632e3e9494ccd91ff14 SHA512 0717fe0cafc2f525d313be07a44ad046ad19806a1b60b6af9c7a9d1ba9852e5f835149732fbc5d224c06c00ad0cfe6b00b870dba4dfcae228c370bc20d747ce1
+EBUILD pauker-1.8-r1.ebuild 1704 BLAKE2B 51df59fb8de90a8cb03f93fbbae9e60ecc68b076eae4bab2b1a3695b716296fb1ac2828382d2ea7d8a6c553e19a588c30d240a7b373499bf9d8451f1f2dc3203 SHA512 056bfe6a4fdf2490f02a5b1681a5173b34933b29aeb8abc24e89ba4d972933e549486c10aab32f929b9058ee4f9716a7840e309de953c09a6f99a4100a6f7da2
 MISC metadata.xml 329 BLAKE2B ac3b4fc371bc34aec1c68eccb0be370cc51c1dffb14fa0b13c5e50aa3476a5e557686a10922379026eccc8d61e60133bc199c9746484cd6a5ff588dcdfe61f67 SHA512 392a3af58bf88c1cfa5ad5f3a240b7c16d2cf4a469700d3e7628917923606b69d3aa65c01d258e17d1ad362fa4f64c424e75a73f849f4fd438f97ba951df8203
diff --git a/games-puzzle/pauker/files/pauker_bundledjars.patch b/games-puzzle/pauker/files/pauker_bundledjars.patch
index 1ed79dbe4d86..bebcbd088b12 100644
--- a/games-puzzle/pauker/files/pauker_bundledjars.patch
+++ b/games-puzzle/pauker/files/pauker_bundledjars.patch
@@ -1,5 +1,5 @@
---- build.xml.orig	2008-11-24 20:24:55.000000000 +1300
-+++ build.xml	2008-11-24 20:25:33.000000000 +1300
+--- a/build.xml.orig	2008-11-24 20:24:55.000000000 +1300
++++ b/build.xml	2008-11-24 20:25:33.000000000 +1300
 @@ -88,11 +88,6 @@
               basedir="build/classes/"
               includes="pauker/**,tools/**"
diff --git a/games-puzzle/pauker/pauker-1.8.ebuild b/games-puzzle/pauker/pauker-1.8-r1.ebuild
index af0161d502ee..62c31d7abb45 100644
--- a/games-puzzle/pauker/pauker-1.8.ebuild
+++ b/games-puzzle/pauker/pauker-1.8-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 java-ant-2 games
+
+inherit desktop java-pkg-2 java-ant-2
 
 DESCRIPTION="A java based flashcard program"
 HOMEPAGE="http://pauker.sourceforge.net/"
@@ -14,27 +15,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-COMMON_DEP="dev-java/browserlauncher2:1.0
-			dev-java/javahelp
-			dev-java/lucene:2.4
-			dev-java/swing-layout:1"
-RDEPEND=">=virtual/jre-1.5
-		${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-		app-arch/unzip
-		${COMMON_DEP}"
-
-S=${WORKDIR}
+COMMON_DEP="
+	dev-java/browserlauncher2:1.0
+	dev-java/javahelp
+	dev-java/lucene:2.4
+	dev-java/swing-layout:1
+"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5
+"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	app-arch/unzip
+"
 
-pkg_setup() {
-	games_pkg_setup
-	java-pkg-2_pkg_setup
-}
+S="${WORKDIR}"
 
 src_prepare() {
+	default
 	find . -iname '*.jar' -delete
 
-	epatch "${FILESDIR}/${PN}_bundledjars.patch"
+	eapply "${FILESDIR}/${PN}_bundledjars.patch"
 
 	java-pkg_jar-from --into libs browserlauncher2-1.0 browserlauncher2.jar BrowserLauncher2-1_3.jar
 	java-pkg_jar-from --into libs javahelp jhall.jar
@@ -52,12 +53,12 @@ src_compile() {
 #tests cannot be build.
 
 src_install() {
-	java-pkg_jarinto "${GAMES_DATADIR}/${PN}"
+	java-pkg_jarinto "/usr/share/${PN}"
 	java-pkg_newjar "dist/${P}.jar"
 
 	java-pkg_dolauncher ${PN} \
-		-into "${GAMES_PREFIX}" \
-		--pwd "${GAMES_DATADIR}"/${PN} \
+		-into "/usr" \
+		--pwd /usr/share/${PN} \
 		--main pauker.program.gui.swing.PaukerFrame
 
 	use doc && java-pkg_dojavadoc dist/javadoc
@@ -65,5 +66,4 @@ src_install() {
 
 	newicon src/pauker/icons/repeat.png ${PN}.png
 	make_desktop_entry pauker Pauker
-	prepgamesdirs
 }