Fix bug 105194

Package-Manager: portage-2.0.52-r1

8 files changed, 16 insertions, 114 deletions

diff --git a/dev-util/argouml/ChangeLog b/dev-util/argouml/ChangeLog
index ea205e555b7c..1828d558084d 100644
--- a/dev-util/argouml/ChangeLog
+++ b/dev-util/argouml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/argouml
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/ChangeLog,v 1.13 2005/08/26 13:26:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/ChangeLog,v 1.14 2005/09/10 14:20:38 axxo Exp $
+
+*argouml-0.18.1-r1 (10 Sep 2005)
+
+  10 Sep 2005; Thomas Matthijs <axxo@gentoo.org> -argouml-0.16.ebuild,
+  -argouml-0.16.1.ebuild, -argouml-0.18.1.ebuild, +argouml-0.18.1-r1.ebuild:
+  Fix bug 105194
 
   26 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> argouml-0.18.1.ebuild:
   Fix cp -a usage for Gentoo/FreeBSD.
diff --git a/dev-util/argouml/Manifest b/dev-util/argouml/Manifest
index 533a412b5fdb..2af9f41da35c 100644
--- a/dev-util/argouml/Manifest
+++ b/dev-util/argouml/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1738e45af387187e01b0fdc22641c7b7 ChangeLog 1752
-MD5 c580d7fbb0605314edd992fbec4e1dc8 argouml-0.18.1.ebuild 1412
-MD5 871d276aaec3658a84748176c3c6b351 argouml-0.16.ebuild 1407
-MD5 13e2c242fdcc20b467fbd9a96a47a05f argouml-0.16.1.ebuild 1409
+MD5 4e847be90387a8baab8759eba21dd67a argouml-0.18.1-r1.ebuild 1396
+MD5 e81de5558f016211090bbf47a01a47bb ChangeLog 1947
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 ae7cf536f0d9d57d4fe913a7084fd4c1 files/digest-argouml-0.16.1 336
-MD5 478b841134711ba627ac5c73229f72c3 files/digest-argouml-0.16 326
-MD5 d787d7cc7dfb1990dbe39b0c6667efe4 files/digest-argouml-0.18.1 336
+MD5 d787d7cc7dfb1990dbe39b0c6667efe4 files/digest-argouml-0.18.1-r1 336
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDDxiXj5H05b2HAEkRAjOOAJ9lW3vn2K7yt7mr5njSerYqOTPqLwCfStUA
-u0VRMuafDUYs4cCuNCrr3V8=
-=4EXt
+iD8DBQFDIuvU/rLF9B432nYRAj0/AJ9zsBgbbT3y8vHBeRUmYTjsTKFdfQCeOQmR
+Dxv5En28smO6N/bJp9hg4Wk=
+=OeVb
 -----END PGP SIGNATURE-----
diff --git a/dev-util/argouml/argouml-0.16.1.ebuild b/dev-util/argouml/argouml-0.16.1.ebuild
deleted file mode 100644
index 6225dd54465d..000000000000
--- a/dev-util/argouml/argouml-0.16.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/argouml-0.16.1.ebuild,v 1.2 2005/05/06 14:40:23 swegener Exp $
-
-inherit java-pkg
-
-DESCRIPTION="ArgoUML is a modelling tool that helps you do your design using UML."
-HOMEPAGE="http://argouml.tigris.org"
-SRC_URI="http://argouml.tigris.org/files/documents/4/0/${P}/ArgoUML-${PV}.tar.gz
-		http://argouml.tigris.org/files/documents/4/0/${P}/ArgoUML-${PV}-modules.tar.gz
-		doc? ( http://argouml.tigris.org/files/documents/4/0/${P}/argomanual-${PV}.pdf
-		http://argouml.tigris.org/files/documents/4/0/${P}/quickguide-${PV}.pdf
-		http://argouml.tigris.org/files/documents/4/0/${P}/cookbook-${PV}.pdf )"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-RESTRICT="nomirror"
-IUSE="doc"
-RDEPEND=">=virtual/jre-1.3"
-S=${WORKDIR}
-
-src_compile() { :; }
-
-src_install() {
-	dodir /opt/${PN}
-	cp -a . ${D}/opt/${PN}/lib/
-	chmod -R 755 ${D}/opt/${PN}
-	touch ${D}/opt/${PN}/lib/argouml.log
-	chmod a+w ${D}/opt/${PN}/lib/argouml.log
-
-	echo "#!/bin/sh" > ${PN}
-	echo "cd /opt/${PN}/lib" >> ${PN}
-	echo '"${JAVA_HOME}"/bin/java -jar argouml.jar' >> ${PN}
-	into /opt
-	dobin ${PN}
-
-	dodoc README.txt
-
-	if use doc ; then
-		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.16.ebuild b/dev-util/argouml/argouml-0.16.ebuild
deleted file mode 100644
index f95131fe91c1..000000000000
--- a/dev-util/argouml/argouml-0.16.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/argouml-0.16.ebuild,v 1.3 2005/05/06 14:40:23 swegener Exp $
-
-inherit java-pkg
-
-DESCRIPTION="ArgoUML is a modelling tool that helps you do your design using UML."
-HOMEPAGE="http://argouml.tigris.org"
-SRC_URI="http://argouml.tigris.org/files/documents/4/0/${P}/ArgoUML-${PV}.tar.gz
-		http://argouml.tigris.org/files/documents/4/0/${P}/ArgoUML-${PV}-modules.tar.gz
-		doc? ( http://argouml.tigris.org/files/documents/4/0/${P}/argomanual-${PV}.pdf
-		http://argouml.tigris.org/files/documents/4/0/${P}/quickguide-${PV}.pdf
-		http://argouml.tigris.org/files/documents/4/0/${P}/cookbook-${PV}.pdf )"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-RESTRICT="nomirror"
-IUSE="doc"
-RDEPEND=">=virtual/jre-1.2"
-S=${WORKDIR}
-
-src_compile() { :; }
-
-src_install() {
-	dodir /opt/${PN}
-	cp -a . ${D}/opt/${PN}/lib/
-	chmod -R 755 ${D}/opt/${PN}
-	touch ${D}/opt/${PN}/lib/argouml.log
-	chmod a+w ${D}/opt/${PN}/lib/argouml.log
-
-	echo "#!/bin/sh" > ${PN}
-	echo "cd /opt/${PN}/lib" >> ${PN}
-	echo '"${JAVA_HOME}"/bin/java -jar argouml.jar' >> ${PN}
-	into /opt
-	dobin ${PN}
-
-	dodoc README.txt
-
-	if use doc ; then
-		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.18.1.ebuild b/dev-util/argouml/argouml-0.18.1-r1.ebuild
index 028d8b42da4e..aebd68fc8de7 100644
--- a/dev-util/argouml/argouml-0.18.1.ebuild
+++ b/dev-util/argouml/argouml-0.18.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/argouml-0.18.1.ebuild,v 1.2 2005/08/26 13:26:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/argouml-0.18.1-r1.ebuild,v 1.1 2005/09/10 14:20:38 axxo Exp $
 
 inherit java-pkg
 
@@ -22,7 +22,7 @@ S=${WORKDIR}
 src_compile() { :; }
 
 src_install() {
-	dodir /opt/${PN}
+	dodir /opt/${PN}/lib/
 	cp -pPR . ${D}/opt/${PN}/lib/
 	chmod -R 755 ${D}/opt/${PN}
 	touch ${D}/opt/${PN}/lib/argouml.log
@@ -30,7 +30,7 @@ src_install() {
 
 	echo "#!/bin/sh" > ${PN}
 	echo "cd /opt/${PN}/lib" >> ${PN}
-	echo '"${JAVA_HOME}"/bin/java -jar argouml.jar' >> ${PN}
+	echo 'java -jar argouml.jar' >> ${PN}
 	into /opt
 	dobin ${PN}
 
diff --git a/dev-util/argouml/files/digest-argouml-0.16 b/dev-util/argouml/files/digest-argouml-0.16
deleted file mode 100644
index abd99f40565a..000000000000
--- a/dev-util/argouml/files/digest-argouml-0.16
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 6ec6ca103b5140df1f6ad18e356a1543 ArgoUML-0.16.tar.gz 5536579
-MD5 3d09450e38023054079809aaec8c6b12 ArgoUML-0.16-modules.tar.gz 80321
-MD5 6b62971623e0d116c1bc972c47477de5 argomanual-0.16.pdf 3250159
-MD5 b0158b39635b721c5b5a1132595fbae7 quickguide-0.16.pdf 30654
-MD5 7841a4b77b7ee8ac099822da2e60b9ba cookbook-0.16.pdf 867317
diff --git a/dev-util/argouml/files/digest-argouml-0.16.1 b/dev-util/argouml/files/digest-argouml-0.16.1
deleted file mode 100644
index 03287cc8fdda..000000000000
--- a/dev-util/argouml/files/digest-argouml-0.16.1
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 a9cbe6b626f507e96e9c907db9819838 ArgoUML-0.16.1.tar.gz 5542726
-MD5 bb27f4ebedaee683c3f25db0105ae3e9 ArgoUML-0.16.1-modules.tar.gz 80380
-MD5 4f252d94632c7cd400846c00dfe2190c argomanual-0.16.1.pdf 3250161
-MD5 215ba6b219ec9a201bb2acfd6b2c3ff5 quickguide-0.16.1.pdf 30656
-MD5 c5719d705ba45ce24ef0d07b9f1bc0ae cookbook-0.16.1.pdf 867318
diff --git a/dev-util/argouml/files/digest-argouml-0.18.1 b/dev-util/argouml/files/digest-argouml-0.18.1-r1
index 059a4e7df44b..059a4e7df44b 100644
--- a/dev-util/argouml/files/digest-argouml-0.18.1
+++ b/dev-util/argouml/files/digest-argouml-0.18.1-r1