Version bump to latest. Drop older.

(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

6 files changed, 18 insertions, 122 deletions

diff --git a/sci-geosciences/mkgmap/ChangeLog b/sci-geosciences/mkgmap/ChangeLog
index 02f3e1f81df0..9534b6e74db0 100644
--- a/sci-geosciences/mkgmap/ChangeLog
+++ b/sci-geosciences/mkgmap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/mkgmap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mkgmap/ChangeLog,v 1.12 2011/03/25 23:09:16 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mkgmap/ChangeLog,v 1.13 2011/06/01 13:11:57 scarabeus Exp $
+
+*mkgmap-1955 (01 Jun 2011)
+
+  01 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> -mkgmap-1000.ebuild,
+  -mkgmap-1038.ebuild, -mkgmap-1080.ebuild, -mkgmap-1200.ebuild,
+  -mkgmap-1903.ebuild, +mkgmap-1955.ebuild:
+  Version bump to latest. Drop older.
 
 *mkgmap-1903 (25 Mar 2011)
 
diff --git a/sci-geosciences/mkgmap/mkgmap-1000.ebuild b/sci-geosciences/mkgmap/mkgmap-1000.ebuild
deleted file mode 100644
index 81ab371b2610..000000000000
--- a/sci-geosciences/mkgmap/mkgmap-1000.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mkgmap/mkgmap-1000.ebuild,v 1.1 2009/04/06 15:29:32 hanno Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Tool to create garmin maps"
-HOMEPAGE="http://www.mkgmap.org.uk"
-SRC_URI="http://www.mkgmap.org.uk/snapshots/${PN}-r${PV}-src.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-S="${WORKDIR}/${PN}-r${PV}"
-
-src_compile() {
-	JAVA_ANT_ENCODING=UTF-8
-	eant dist
-}
-
-src_install() {
-	java-pkg_newjar "dist/${PN}.jar" || die "java-pkg_newjar failed"
-	java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
-
-	dodoc dist/README dist/doc/Credits dist/doc/*.txt || die "dodoc failed"
-	doman dist/doc/mkgmap.1 || die "doman failed"
-}
diff --git a/sci-geosciences/mkgmap/mkgmap-1038.ebuild b/sci-geosciences/mkgmap/mkgmap-1038.ebuild
deleted file mode 100644
index 76494bcf26be..000000000000
--- a/sci-geosciences/mkgmap/mkgmap-1038.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mkgmap/mkgmap-1038.ebuild,v 1.1 2009/05/20 13:51:37 hanno Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Tool to create garmin maps"
-HOMEPAGE="http://www.mkgmap.org.uk"
-SRC_URI="http://www.mkgmap.org.uk/snapshots/${PN}-r${PV}-src.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-S="${WORKDIR}/${PN}-r${PV}"
-
-src_compile() {
-	JAVA_ANT_ENCODING=UTF-8
-	eant dist
-}
-
-src_install() {
-	java-pkg_newjar "dist/${PN}.jar" || die "java-pkg_newjar failed"
-	java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
-
-	dodoc dist/README dist/doc/Credits dist/doc/*.txt || die "dodoc failed"
-	doman dist/doc/mkgmap.1 || die "doman failed"
-}
diff --git a/sci-geosciences/mkgmap/mkgmap-1080.ebuild b/sci-geosciences/mkgmap/mkgmap-1080.ebuild
deleted file mode 100644
index 154432d97e44..000000000000
--- a/sci-geosciences/mkgmap/mkgmap-1080.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mkgmap/mkgmap-1080.ebuild,v 1.1 2009/07/08 13:52:08 hanno Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Tool to create garmin maps"
-HOMEPAGE="http://www.mkgmap.org.uk"
-SRC_URI="http://www.mkgmap.org.uk/snapshots/${PN}-r${PV}-src.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-S="${WORKDIR}/${PN}-r${PV}"
-
-src_compile() {
-	JAVA_ANT_ENCODING=UTF-8
-	eant dist
-}
-
-src_install() {
-	java-pkg_newjar "dist/${PN}.jar" || die "java-pkg_newjar failed"
-	java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
-
-	dodoc dist/README dist/doc/Credits dist/doc/*.txt || die "dodoc failed"
-	doman dist/doc/mkgmap.1 || die "doman failed"
-}
diff --git a/sci-geosciences/mkgmap/mkgmap-1200.ebuild b/sci-geosciences/mkgmap/mkgmap-1200.ebuild
deleted file mode 100644
index 62018855e7ff..000000000000
--- a/sci-geosciences/mkgmap/mkgmap-1200.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mkgmap/mkgmap-1200.ebuild,v 1.1 2009/09/19 18:06:26 hanno Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Tool to create garmin maps"
-HOMEPAGE="http://www.mkgmap.org.uk"
-SRC_URI="http://www.mkgmap.org.uk/snapshots/${PN}-r${PV}-src.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-S="${WORKDIR}/${PN}-r${PV}"
-
-src_compile() {
-	JAVA_ANT_ENCODING=UTF-8
-	eant dist
-}
-
-src_install() {
-	java-pkg_newjar "dist/${PN}.jar" || die "java-pkg_newjar failed"
-	java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
-
-	dodoc dist/README dist/doc/Credits dist/doc/*.txt || die "dodoc failed"
-	doman dist/doc/mkgmap.1 || die "doman failed"
-}
diff --git a/sci-geosciences/mkgmap/mkgmap-1903.ebuild b/sci-geosciences/mkgmap/mkgmap-1955.ebuild
index ca35137fa26c..eb385ccc8134 100644
--- a/sci-geosciences/mkgmap/mkgmap-1903.ebuild
+++ b/sci-geosciences/mkgmap/mkgmap-1955.ebuild
@@ -1,29 +1,34 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mkgmap/mkgmap-1903.ebuild,v 1.1 2011/03/25 23:09:16 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mkgmap/mkgmap-1955.ebuild,v 1.1 2011/06/01 13:11:57 scarabeus Exp $
 
+EAPI=4
+
+JAVA_ANT_ENCODING=UTF-8
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Tool to create garmin maps"
 HOMEPAGE="http://www.mkgmap.org.uk"
 SRC_URI="http://www.mkgmap.org.uk/snapshots/${PN}-r${PV}-src.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+
 IUSE=""
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
+
 S="${WORKDIR}/${PN}-r${PV}"
 
 src_compile() {
-	JAVA_ANT_ENCODING=UTF-8
-	eant dist
+	eant dist || die
 }
 
 src_install() {
 	java-pkg_newjar "dist/${PN}.jar" || die "java-pkg_newjar failed"
 	java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
 
-	dodoc dist/README dist/doc/Credits dist/doc/*.txt || die "dodoc failed"
-	doman dist/doc/mkgmap.1 || die "doman failed"
+	dodoc dist/README dist/doc/Credits dist/doc/*.txt
+	doman dist/doc/mkgmap.1
 }