-bin rename fixes

4 files changed, 18 insertions, 12 deletions

diff --git a/dev-java/avalon-logkit-bin/ChangeLog b/dev-java/avalon-logkit-bin/ChangeLog
index abc6a50f9992..8d950e8faae8 100644
--- a/dev-java/avalon-logkit-bin/ChangeLog
+++ b/dev-java/avalon-logkit-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/avalon-logkit
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit-bin/ChangeLog,v 1.1 2004/07/30 18:39:42 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit-bin/ChangeLog,v 1.2 2004/07/31 11:48:14 axxo Exp $
+
+  31 Jul 2004; Thomas Matthijs <axxo@gentoo.org>
+  avalon-logkit-bin-1.2.2.ebuild, avalon-logkit-bin-1.2.ebuild:
+  -bin rename fixes
 
 *avalon-logkit-bin-1.2 (30 Jul 2004)
 
diff --git a/dev-java/avalon-logkit-bin/Manifest b/dev-java/avalon-logkit-bin/Manifest
index e459dacab587..42c78d4a857b 100644
--- a/dev-java/avalon-logkit-bin/Manifest
+++ b/dev-java/avalon-logkit-bin/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 051cbf7c1f38ee4179cb5ffda8500c98 avalon-logkit-bin-1.2.ebuild 725
-MD5 5c7c6a979fe64de219a50f210d0b0fba avalon-logkit-bin-1.2.2.ebuild 803
-MD5 4af227fcf01d7d15833a1d04759eb278 ChangeLog 1073
+MD5 e0857f62912a8aa5ca73c488577970bb avalon-logkit-bin-1.2.ebuild 743
+MD5 ff72aa4f1316339417dd2df2225c1983 avalon-logkit-bin-1.2.2.ebuild 834
+MD5 09f00c9c57123e48ef83472c3d7e48b1 ChangeLog 1207
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 f91f5dde7fd989c6aa2d4fdf8ca3062a files/digest-avalon-logkit-bin-1.2.2 64
 MD5 cf94b537a4f9f4020d76a203b13ad0d6 files/digest-avalon-logkit-bin-1.2 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBCpZg/rLF9B432nYRAgcTAJ0UVN+1EqXlgySKEpySAG5AAcxAUACfezCR
-nd/O2wYiP/sdgtiEDX9MKII=
-=HcbC
+iD8DBQFBC4do/rLF9B432nYRAhJyAJ9SWb6UeUzYA7XLkWOVmkSj9MxszACfeG5H
+WR8YtSTT4Uz9El5lCZ3wQvc=
+=OJT/
 -----END PGP SIGNATURE-----
diff --git a/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.2.ebuild b/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.2.ebuild
index 25fae9a98eda..fad1edaf498f 100644
--- a/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.2.ebuild
+++ b/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.2.ebuild,v 1.1 2004/07/30 18:39:42 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.2.ebuild,v 1.2 2004/07/31 11:48:14 axxo Exp $
 
 inherit java-pkg
 
@@ -14,13 +14,14 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
 IUSE="doc"
 
-S=${WORKDIR}/${P/avalon-}-dev
+MY_P=${P/-bin}
+S=${WORKDIR}/${MY_P/avalon-}-dev
 
 src_compile() { :; }
 
 src_install() {
-	mv ${P/avalon-}.jar ${PN}.jar
-	java-pkg_dojar ${PN}.jar || die "Unable to Install"
+	mv ${MY_P/avalon-}.jar ${PN/-bin}.jar
+	java-pkg_dojar ${PN/-bin}.jar || die "Unable to Install"
 	dodoc README.txt
 	use doc && dohtml -r docs/*
 }
diff --git a/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.ebuild b/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.ebuild
index ac5f047498bb..ad034bf549f1 100644
--- a/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.ebuild
+++ b/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.ebuild,v 1.1 2004/07/30 18:39:42 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit-bin/avalon-logkit-bin-1.2.ebuild,v 1.2 2004/07/31 11:48:14 axxo Exp $
 
 DESCRIPTION="LogKit is an easy-to-use Java logging toolkit designed for secure, performance-oriented logging."
 HOMEPAGE="http://avalon.apache.org/"
 MY_P=${PN/avalon-logkit/LogKit}-${PV}
+MY_P=${MY_P/-bin}
 SRC_URI="mirror://apache/avalon/logkit/${PV}/LogKit-${PV}-bin.tar.gz"
 DEPEND=">=virtual/jre-1.3"
 RDEPEND=">=virtual/jre-1.3"