6 files changed, 61 insertions, 65 deletions
diff --git a/media-gfx/aoi/ChangeLog b/media-gfx/aoi/ChangeLog
index 0530bf6e42a9..83d71ac03475 100644
--- a/media-gfx/aoi/ChangeLog
+++ b/media-gfx/aoi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/aoi
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/ChangeLog,v 1.14 2006/01/12 19:44:37 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/ChangeLog,v 1.15 2006/02/12 21:58:07 vanquirius Exp $
+
+*aoi-2.2.1 (12 Feb 2006)
+
+  12 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> -aoi-1.6.ebuild,
+  +aoi-2.2.1.ebuild:
+  2.2.1 version bump. Install scripts under aoi's lib directory. Fixes bug
+  122612, reported by Cyril Jaquier <cyril dot jaquier at bluewin dot ch>.
+  Also added a desktop entry.
 
   12 Jan 2006; Luis Medinas <metalgod@gentoo.org> aoi-2.2.ebuild:
   Added ~amd64 keyword. Closes bug #118540.
diff --git a/media-gfx/aoi/Manifest b/media-gfx/aoi/Manifest
index 240afb49961f..927325967da6 100644
--- a/media-gfx/aoi/Manifest
+++ b/media-gfx/aoi/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a0ad125c12ddfdcda54f448c77df04b2 ChangeLog 2130
+MD5 8fbeebf109e18bf0864ea05b3cfd6443 ChangeLog 2429
 MD5 0755b5b6b83c178025bf0196d4b6d8f8 aoi-1.4.ebuild 1231
-MD5 3e498ceae95cb1123df1d498852a1b73 aoi-1.6.ebuild 1422
+MD5 5247abd61c10703c780441df3ebd2fa2 aoi-2.2.1.ebuild 1180
 MD5 c294e6306bffcb5f54a05d8dc2fdbbcd aoi-2.2.ebuild 1137
 MD5 727b608356405769368445d94052541c files/aoi 857
 MD5 3ecf40985d61919e8ca250e839e013a3 files/digest-aoi-1.4 121
-MD5 4ec032a15afd71be0cd9cc75ea3685ed files/digest-aoi-1.6 114
 MD5 b37b3bef7b7d1f576bb061fa4790e17c files/digest-aoi-2.2 115
+MD5 b27cd96e147f8cf176a9dbff7362ce98 files/digest-aoi-2.2.1 116
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDxrF9wUpWvClEHQoRAmvfAJ93DcnENBPJu+osWPkaSHOBpHqgSQCeMnyo
-Pxo0DSLgDa4MZ8mKiJMe2G8=
-=8Ytm
------END PGP SIGNATURE-----
diff --git a/media-gfx/aoi/aoi-1.6.ebuild b/media-gfx/aoi/aoi-1.6.ebuild
deleted file mode 100644
index 99ff0b0599bf..000000000000
--- a/media-gfx/aoi/aoi-1.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/aoi-1.6.ebuild,v 1.10 2005/09/15 20:11:19 halcy0n Exp $
-
-inherit java-pkg
-
-MY_P="AoIsrc16"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="A free, open-source 3D modelling and rendering studio."
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
-	doc? ( http://aoi.sourceforge.net/docs/downloads/manual.zip )"
-HOMEPAGE="http://aoi.sourceforge.net/index"
-KEYWORDS="~x86 ~sparc ~ppc"
-LICENSE="GPL-2"
-SLOT="0"
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jdk-1.2
-	dev-java/jmf-bin
-	dev-java/ant"
-IUSE="doc"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${MY_P}.zip
-	use doc && unpack manual.zip
-}
-src_compile() {
-
-	export CLASSPATH="/usr/share/jmf/lib/jmf.jar"
-
-	ant -buildfile ArtOfIllusion.xml || die "Building ArtOfIllusion failed"
-	ant -buildfile OSSpecific.xml || die "Building OSSpecific failed"
-	ant -buildfile Renderers.xml || die "Building Renderers failed"
-	ant -buildfile Tools.xml || die "Building Tools failed"
-	ant -buildfile Translators.xml || die "Building Translators failed"
-}
-
-src_install() {
-	DEP_APPEND="jmf"
-	dobin ${FILESDIR}/aoi
-	dodoc HISTORY LICENSE README-source
-	if use doc ; then
-		mv ${WORKDIR}/AoI\ Manual/ ${WORKDIR}/aoi_manual/
-		dohtml -r ${WORKDIR}/aoi_manual/
-	fi
-	java-pkg_dojar ArtOfIllusion.jar
-	JARDESTTREE="lib/Plugins"
-	java-pkg_dojar Plugins/*.jar
-}
diff --git a/media-gfx/aoi/aoi-2.2.1.ebuild b/media-gfx/aoi/aoi-2.2.1.ebuild
new file mode 100644
index 000000000000..8ad78bd799f8
--- /dev/null
+++ b/media-gfx/aoi/aoi-2.2.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/aoi-2.2.1.ebuild,v 1.1 2006/02/12 21:58:07 vanquirius Exp $
+
+inherit java-pkg eutils
+
+MY_P="aoi221"
+MY_MANUAL_V="2.2"
+S="${WORKDIR}/ArtOfIllusion${PV}"
+DESCRIPTION="A free, open-source 3D modelling and rendering studio."
+SRC_URI="mirror://sourceforge/aoi/${MY_P}.zip
+	doc? ( mirror://sourceforge/aoi/manual${MY_MANUAL_V}.zip )"
+HOMEPAGE="http://aoi.sourceforge.net/index"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jdk-1.2"
+IUSE="doc"
+
+src_install() {
+	# wrapper script
+	dobin "${FILESDIR}"/aoi
+
+	# documentation
+	dodoc HISTORY README
+	if use doc ; then
+		mv "${WORKDIR}"/AoI\ Manual/ "${WORKDIR}"/aoi_manual
+		dohtml -r "${WORKDIR}"/aoi_manual/
+	fi
+
+	# main app
+	java-pkg_dojar ArtOfIllusion.jar
+
+	# plugins
+	mv Plugins "${D}"/usr/share/${PN}/lib
+
+	# scripts
+	mv Scripts "${D}"/usr/share/${PN}/lib
+
+	# icon
+	mv Icons/64x64.png Icons/aoi.png
+	doicon Icons/aoi.png
+
+	# desktop entry
+	make_desktop_entry aoi "Art of Illusion" /usr/share/pixmaps/aoi.png "Graphics"
+}
diff --git a/media-gfx/aoi/files/digest-aoi-1.6 b/media-gfx/aoi/files/digest-aoi-1.6
deleted file mode 100644
index efcad1c140da..000000000000
--- a/media-gfx/aoi/files/digest-aoi-1.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 79e0c4f155c7c7dcd0687659b7860c80 AoIsrc16.zip 1386594
-MD5 2137b19fe2ea2aaeefa35f9e50519c28 manual.zip 7370510
diff --git a/media-gfx/aoi/files/digest-aoi-2.2.1 b/media-gfx/aoi/files/digest-aoi-2.2.1
new file mode 100644
index 000000000000..6e2230262076
--- /dev/null
+++ b/media-gfx/aoi/files/digest-aoi-2.2.1
@@ -0,0 +1,2 @@
+MD5 54e91c62d1873d6ee3f0531787a441a5 aoi221.zip 2653431
+MD5 42da45bc3be3504fb1f6b6949cb3d486 manual2.2.zip 11458498