[gentoo-commits] proj/sci:master commit in: sci-misc/jwnl/

["Christoph Junghans" <ottxor@gentoo.org>]

commit:     9b7147dbf2dc7d8919c1af5f65f893ec0f3d9256
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 12 12:35:46 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Nov 12 12:35:46 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9b7147db

sci-misc/jwnl: Bump to EAPI=5

Package-Manager: portage-2.2.14

---
 sci-misc/jwnl/ChangeLog           |  6 +++++-
 sci-misc/jwnl/jwnl-1.3_rc3.ebuild | 11 ++++++-----
 sci-misc/jwnl/metadata.xml        |  8 ++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/sci-misc/jwnl/ChangeLog b/sci-misc/jwnl/ChangeLog
index ad465e5..9a05001 100644
--- a/sci-misc/jwnl/ChangeLog
+++ b/sci-misc/jwnl/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-misc/jwnl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Nov 2014; Justin Lecher <jlec@gentoo.org> jwnl-1.3_rc3.ebuild,
+  metadata.xml:
+  Bump to EAPI=5
+
   25 Oct 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Removed no-herd from herd tag in metadata.xml
 

diff --git a/sci-misc/jwnl/jwnl-1.3_rc3.ebuild b/sci-misc/jwnl/jwnl-1.3_rc3.ebuild
index 66b4877..aa2f665 100644
--- a/sci-misc/jwnl/jwnl-1.3_rc3.ebuild
+++ b/sci-misc/jwnl/jwnl-1.3_rc3.ebuild
@@ -2,12 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=5
+
 inherit eutils java-pkg-2 java-utils-2 versionator
 
 MY_P=${PN}$(delete_all_version_separators)
+
 DESCRIPTION="Java interface to WordNet dictionary data"
 HOMEPAGE="http://jwordnet.sf.net"
-SRC_URI="mirror://sourceforge/jwordnet/${MY_P}_src.zip
+SRC_URI="
+	mirror://sourceforge/jwordnet/${MY_P}_src.zip
 	mirror://sourceforge/jwordnet/${MY_P}.zip"
 
 LICENSE="BSD"
@@ -23,9 +27,7 @@ RDEPEND=">=virtual/jre-1.4
 
 S="${WORKDIR}"
 
-src_unpack() {
-	cd "${S}"
-	unpack ${A}
+src_prepare() {
 	rm -v commons-logging.jar jwnl.jar || die
 }
 
@@ -39,7 +41,6 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar ${PN}.jar utilities.jar
-	dodir /usr/share/${PN}
 	insinto /usr/share/${PN}
 	doins create.sql database_properties.xml file_properties.xml \
 		jwnl_properties.dtd jwnl_properties.xsd map_properties.xml

diff --git a/sci-misc/jwnl/metadata.xml b/sci-misc/jwnl/metadata.xml
index 84a13b8..faf15b4 100644
--- a/sci-misc/jwnl/metadata.xml
+++ b/sci-misc/jwnl/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>flammie@gentoo.org</email>
-	</maintainer>
-	<longdescription>
+  <maintainer>
+    <email>flammie@gentoo.org</email>
+  </maintainer>
+  <longdescription>
   Java based programming interface for accessing wordnet style dictionary
   data.
 </longdescription>