Use shipped png. #370921

Move to freedesktop category Development. #373017
Remove old/unused.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

8 files changed, 19 insertions, 226 deletions

diff --git a/dev-util/argouml/ChangeLog b/dev-util/argouml/ChangeLog
index 42878a82627b..7056b4a37d02 100644
--- a/dev-util/argouml/ChangeLog
+++ b/dev-util/argouml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/argouml
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/ChangeLog,v 1.32 2012/02/03 15:16:24 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/ChangeLog,v 1.33 2012/02/06 15:17:43 sera Exp $
+
+  06 Feb 2012; Ralph Sennhauser <sera@gentoo.org> -argouml-0.24.ebuild,
+  -argouml-0.26.ebuild, -argouml-0.29.2-r1.ebuild, -argouml-0.30.2.ebuild,
+  argouml-0.32.2.ebuild, argouml-0.34.ebuild, -files/argouml.png:
+  Use shipped png. #370921
+  Move to freedesktop category Development. #373017
+  Remove old/unused.
 
 *argouml-0.34 (03 Feb 2012)
 
diff --git a/dev-util/argouml/argouml-0.24.ebuild b/dev-util/argouml/argouml-0.24.ebuild
deleted file mode 100644
index b5662da36568..000000000000
--- a/dev-util/argouml/argouml-0.24.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/argouml-0.24.ebuild,v 1.3 2008/08/30 14:33:07 ranger Exp $
-
-inherit java-pkg-2
-
-DESCRIPTION="modelling tool that helps you do your design using UML"
-HOMEPAGE="http://argouml.tigris.org"
-BASE_URI="http://argouml-downloads.tigris.org/nonav/${P}"
-SRC_URI="${BASE_URI}/ArgoUML-${PV}.tar.gz
-	http://argouml-downloads.tigris.org/nonav/argouml-db-1.0/dbuml-module-1.0.4.zip
-	doc? (
-		${BASE_URI}/argomanual-${PV}.pdf
-		${BASE_URI}/quickguide-${PV}.pdf
-		${BASE_URI}/cookbook-${PV}.pdf
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}"
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_jarinto /opt/${PN}/lib
-	java-pkg_dojar *.jar
-
-	java-pkg_jarinto /opt/${PN}/lib/ext
-	java-pkg_dojar ext/*.jar release/ext/*.jar
-
-	java-pkg_dolauncher ${PN} --main org.argouml.application.Main
-
-	dodoc README.txt || die
-
-	if use doc ; then
-		dohtml -r release/{Readme.htm,www} || die
-		insinto /usr/share/doc/${P}
-		doins "${DISTDIR}/argomanual-${PV}.pdf"
-		doins "${DISTDIR}/quickguide-${PV}.pdf"
-		doins "${DISTDIR}/cookbook-${PV}.pdf"
-	fi
-}
diff --git a/dev-util/argouml/argouml-0.26.ebuild b/dev-util/argouml/argouml-0.26.ebuild
deleted file mode 100644
index 8955caef1ae4..000000000000
--- a/dev-util/argouml/argouml-0.26.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/argouml-0.26.ebuild,v 1.2 2008/11/03 16:39:49 mr_bones_ Exp $
-
-inherit java-pkg-2
-
-DESCRIPTION="modelling tool that helps you do your design using UML"
-HOMEPAGE="http://argouml.tigris.org"
-BASE_URI="http://argouml-downloads.tigris.org/nonav/${P}"
-SRC_URI="${BASE_URI}/ArgoUML-${PV}.tar.gz
-	http://argouml-downloads.tigris.org/nonav/argouml-db-1.0/dbuml-module-1.0.4.zip
-	doc? (
-		${BASE_URI}/argomanual-${PV}.pdf
-		${BASE_URI}/quickguide-${PV}.pdf
-		${BASE_URI}/cookbook-${PV}.pdf
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}"
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_jarinto /opt/${PN}/lib
-	java-pkg_dojar ${P}/*.jar
-
-	java-pkg_jarinto /opt/${PN}/lib/ext
-	java-pkg_dojar ${P}/ext/*.jar release/ext/*.jar
-
-	java-pkg_dolauncher ${PN} --main org.argouml.application.Main
-
-	dodoc ${P}/README.txt
-
-	if use doc ; then
-		dohtml -r release/{Readme.htm,www}
-		insinto /usr/share/doc/${P}
-		doins "${DISTDIR}/argomanual-${PV}.pdf"
-		doins "${DISTDIR}/quickguide-${PV}.pdf"
-		doins "${DISTDIR}/cookbook-${PV}.pdf"
-	fi
-}
diff --git a/dev-util/argouml/argouml-0.29.2-r1.ebuild b/dev-util/argouml/argouml-0.29.2-r1.ebuild
deleted file mode 100644
index 92e182ea02d9..000000000000
--- a/dev-util/argouml/argouml-0.29.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/argouml-0.29.2-r1.ebuild,v 1.2 2010/01/15 21:10:37 fauli Exp $
-
-EAPI="2"
-
-inherit fdo-mime java-pkg-2
-
-DESCRIPTION="modelling tool that helps you do your design using UML"
-HOMEPAGE="http://argouml.tigris.org"
-BASE_URI="http://argouml-downloads.tigris.org/nonav/${P}"
-SRC_URI="${BASE_URI}/ArgoUML-${PV}.tar.gz
-	http://argouml-downloads.tigris.org/nonav/argouml-db-1.0/dbuml-module-1.0.4.zip
-	doc? (
-		${BASE_URI}/manual-${PV}.pdf
-		${BASE_URI}/quickguide-${PV}.pdf
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}"
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_jarinto /opt/${PN}/lib
-	java-pkg_dojar ${P}/*.jar
-
-	java-pkg_jarinto /opt/${PN}/lib/ext
-	java-pkg_dojar ${P}/ext/*.jar release/ext/*.jar
-
-	java-pkg_dolauncher ${PN} --main org.argouml.application.Main
-
-	dodoc ${P}/README.txt || die
-
-	if use doc ; then
-		dohtml -r release/{Readme.htm,www}
-		insinto /usr/share/doc/${P}
-		doins "${DISTDIR}/manual-${PV}.pdf"
-		doins "${DISTDIR}/quickguide-${PV}.pdf"
-	fi
-
-	doicon "${FILESDIR}"/${PN}.png || die
-	make_desktop_entry ${PN} "ArgoUML" ${PN} "Graphics"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/dev-util/argouml/argouml-0.30.2.ebuild b/dev-util/argouml/argouml-0.30.2.ebuild
deleted file mode 100644
index 1dcd9f9bb926..000000000000
--- a/dev-util/argouml/argouml-0.30.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/argouml-0.30.2.ebuild,v 1.1 2011/01/18 15:55:40 fordfrog Exp $
-
-EAPI="3"
-
-inherit fdo-mime java-pkg-2
-
-DESCRIPTION="modelling tool that helps you do your design using UML"
-HOMEPAGE="http://argouml.tigris.org"
-BASE_URI="http://argouml-downloads.tigris.org/nonav/${P}"
-SRC_URI="${BASE_URI}/ArgoUML-${PV}.tar.gz
-	http://argouml-downloads.tigris.org/nonav/argouml-db-1.0/dbuml-module-1.0.4.zip
-	doc? (
-		${BASE_URI}/manual-${PV}.pdf
-		${BASE_URI}/quickguide-${PV}.pdf
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}"
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_jarinto /opt/${PN}/lib
-	java-pkg_dojar ${P}/*.jar
-
-	java-pkg_jarinto /opt/${PN}/lib/ext
-	java-pkg_dojar ${P}/ext/*.jar release/ext/*.jar
-
-	java-pkg_dolauncher ${PN} --main org.argouml.application.Main
-
-	dodoc ${P}/README.txt || die
-
-	if use doc ; then
-		dohtml -r release/{Readme.htm,www}
-		insinto /usr/share/doc/${P}
-		doins "${DISTDIR}/manual-${PV}.pdf"
-		doins "${DISTDIR}/quickguide-${PV}.pdf"
-	fi
-
-	doicon "${FILESDIR}"/${PN}.png || die
-	make_desktop_entry ${PN} "ArgoUML" ${PN} "Graphics"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/dev-util/argouml/argouml-0.32.2.ebuild b/dev-util/argouml/argouml-0.32.2.ebuild
index aa710193d1d7..90fd0c923b71 100644
--- a/dev-util/argouml/argouml-0.32.2.ebuild
+++ b/dev-util/argouml/argouml-0.32.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/argouml-0.32.2.ebuild,v 1.1 2011/06/22 09:42:52 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/argouml-0.32.2.ebuild,v 1.2 2012/02/06 15:17:43 sera Exp $
 
 EAPI="3"
 
-inherit fdo-mime java-pkg-2
+inherit eutils fdo-mime java-pkg-2
 
-DESCRIPTION="modelling tool that helps you do your design using UML"
+DESCRIPTION="Modelling tool that helps you do your design using UML"
 HOMEPAGE="http://argouml.tigris.org"
 BASE_URI="http://argouml-downloads.tigris.org/nonav/${P}"
 SRC_URI="${BASE_URI}/ArgoUML-${PV}.tar.gz
@@ -46,8 +46,8 @@ src_install() {
 		doins "${DISTDIR}/quickguide-${PV}.pdf"
 	fi
 
-	doicon "${FILESDIR}"/${PN}.png || die
-	make_desktop_entry ${PN} "ArgoUML" ${PN} "Graphics"
+	newicon ${P}/icon/ArgoIcon128x128.png ${PN}.png || die
+	make_desktop_entry ${PN} "ArgoUML"
 }
 
 pkg_postinst() {
diff --git a/dev-util/argouml/argouml-0.34.ebuild b/dev-util/argouml/argouml-0.34.ebuild
index 8f99196f7867..59d42e93811e 100644
--- a/dev-util/argouml/argouml-0.34.ebuild
+++ b/dev-util/argouml/argouml-0.34.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/argouml-0.34.ebuild,v 1.1 2012/02/03 15:16:24 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/argouml-0.34.ebuild,v 1.2 2012/02/06 15:17:43 sera Exp $
 
 EAPI="3"
 
-inherit fdo-mime java-pkg-2
+inherit eutils fdo-mime java-pkg-2
 
-DESCRIPTION="modelling tool that helps you do your design using UML"
+DESCRIPTION="Modelling tool that helps you do your design using UML"
 HOMEPAGE="http://argouml.tigris.org"
 BASE_URI="http://argouml-downloads.tigris.org/nonav/${P}"
 SRC_URI="${BASE_URI}/ArgoUML-${PV}.tar.gz
@@ -46,8 +46,8 @@ src_install() {
 		doins "${DISTDIR}/quickguide-${PV}.pdf"
 	fi
 
-	doicon "${FILESDIR}"/${PN}.png || die
-	make_desktop_entry ${PN} "ArgoUML" ${PN} "Graphics"
+	newicon ${P}/icon/ArgoIcon128x128.png ${PN}.png || die
+	make_desktop_entry ${PN} "ArgoUML"
 }
 
 pkg_postinst() {
diff --git a/dev-util/argouml/files/argouml.png b/dev-util/argouml/files/argouml.png
deleted file mode 100644
index 951313795165..000000000000
--- a/dev-util/argouml/files/argouml.png
+++ /dev/null