Version bumped. Fixed locations. Removed old version.

Package-Manager: portage-2.1.6.8/cvs/Linux x86_64

4 files changed, 60 insertions, 72 deletions

diff --git a/app-doc/NaturalDocs/ChangeLog b/app-doc/NaturalDocs/ChangeLog
index 372820355f2d..f9767f81b1d7 100644
--- a/app-doc/NaturalDocs/ChangeLog
+++ b/app-doc/NaturalDocs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-doc/NaturalDocs
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/NaturalDocs/ChangeLog,v 1.20 2008/03/12 10:10:00 phreak Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/NaturalDocs/ChangeLog,v 1.21 2009/03/29 16:33:25 matsuu Exp $
+
+*NaturalDocs-1.40 (29 Mar 2009)
+
+  29 Mar 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -NaturalDocs-1.22-r1.ebuild, +NaturalDocs-1.40.ebuild:
+  Version bumped. Fixed locations. Removed old version.
 
   12 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Josh Glover (jmglov, #206782) from metadata.xml.
diff --git a/app-doc/NaturalDocs/Manifest b/app-doc/NaturalDocs/Manifest
index b3495eacbf67..30affc64fb2d 100644
--- a/app-doc/NaturalDocs/Manifest
+++ b/app-doc/NaturalDocs/Manifest
@@ -1,17 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST NaturalDocs-1.22-Patch-3.zip 14712 RMD160 1ed6b1b3027cec56c8d131c3aff718314ff982de SHA1 824c181d6971acf02b7e23ab595ab71988a36e02 SHA256 2263f7aad74f1cb5f33ff2968f5cbc614bde3e29f21da6ca1d04c761ac2c64a9
-DIST NaturalDocs-1.22.zip 271369 RMD160 8612a8cc2d902f6bc789cf5362d41d7c65979cb2 SHA1 dffe0dd0428da133de82968a858325d035de185e SHA256 813cc838f37e163ab7f241e469e0ebb3b313c1cd4065bd17739cfff0f612e441
 DIST NaturalDocs-1.35.zip 344357 RMD160 940720d88fcfca4884435cb1019f62d127ed5e2f SHA1 6ecd583d6d01beb27b9362c9cef9077c1a50cb5f SHA256 f509a4d4e01d673a5e44fa45d6ca7851af7b3e00189afb5f23c0e57123e55fed
-EBUILD NaturalDocs-1.22-r1.ebuild 1567 RMD160 bb34076acee058c2b7a40193e9b0c2f3afa73943 SHA1 177a8fd91ff81dbb659c82cce1c5fa73b7945739 SHA256 ea0114c786d3bb1eb487e850065d516ba5b2c9fdd56c0bf360eb724b5163142b
+DIST NaturalDocs-1.4.zip 422789 RMD160 d4f184577899d4e2aa892e0ac00fc4a10b0a5a6d SHA1 ebd5b39abc15cf4e44db83d7080aefd930ca41ae SHA256 fc625ed5612dbb3f291290f2e39a0626377b7ad3f634a021dbfe5a75137d6072
 EBUILD NaturalDocs-1.35.ebuild 1024 RMD160 b87e828f33a2fa99ff3dd027843f99d8c30c053c SHA1 4d07274c40bdedf605313f16ea303c7ebc767853 SHA256 f22aaaf09ab70b3e2b6b0099e709f34b6e695e72b34f2bff8730b8c3e810be3b
-MISC ChangeLog 2440 RMD160 2cb8dade69c20528426e129c127b725f2da8db0f SHA1 63175c00ff6ae7093fcecd98653b3d43a108f2ad SHA256 b6dd8ea47a0a9bbcaca4160f85e58817b8b82b598731ebc2499e8465893eadaa
+EBUILD NaturalDocs-1.40.ebuild 1175 RMD160 0c58a24a709b3a8c1df2b5916f3c40baf47c3572 SHA1 d7515873af682f2b3fe2d47ac60d5ad27c6024af SHA256 0849d521a422a65a1a084f561b64392d53619a3ee7fd8c0beafce15858680511
+MISC ChangeLog 2636 RMD160 82fab13c880ebf3a6c980d3e7fac878816d846b6 SHA1 da64db4c09cd7b44332f29197e239e24dac4568b SHA256 b6048a1eb7396957b1d7965bd937ecd086ef1f5ba8b8625c68b06d5c2e790489
 MISC metadata.xml 651 RMD160 2e372c41c1344e612dfcc5e013e676b4c7e9e4ab SHA1 8f3a3339e1986671337776e1998c93376279cb39 SHA256 eb49c97dd5a1d4b888e9adb0795955c9fb5883c0c5074278dc6301a851875f55
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH16v/yuNVb5qfaOYRAkSTAJ9Ev6Jz1K/PJuw6nhGR8WPZA4PTHgCfSOr4
-GGSfo2fK1nhZlHcovBr+lNQ=
-=ck+s
------END PGP SIGNATURE-----
diff --git a/app-doc/NaturalDocs/NaturalDocs-1.22-r1.ebuild b/app-doc/NaturalDocs/NaturalDocs-1.22-r1.ebuild
deleted file mode 100644
index 5da131986f3e..000000000000
--- a/app-doc/NaturalDocs/NaturalDocs-1.22-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/NaturalDocs/NaturalDocs-1.22-r1.ebuild,v 1.11 2007/01/19 13:55:23 masterdriverz Exp $
-
-DESCRIPTION="Extensible, multi-language source code documentation generator"
-HOMEPAGE="http://www.naturaldocs.org/"
-SRC_URI="mirror://sourceforge/naturaldocs/${P}.zip mirror://sourceforge/naturaldocs/${P}-Patch-3.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc amd64"
-
-IUSE=""
-
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_unpack() {
-	mkdir ${P} || die "could not create directory ${P}"
-	cd ${P}
-	unzip ${DISTDIR}/${P}.zip
-
-	# See if we have a patch. If we have more than one, use the highest-
-	# numbered one *only*
-	local patch=`ls -r ${DISTDIR}/${P}-Patch-?.zip | head -n -1`
-
-	# If we have a patch, it is actually a whole new Perl module. Just
-	# unzip it over top of the original one.
-	if [ -n "${patch}" ]; then
-		einfo Applying patch: `basename ${patch}`
-		unzip -o ${patch}
-	fi
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	# Install Perl script, modules, and other supporting stuff
-	dodir /usr/share/NaturalDocs
-	cp -pPR NaturalDocs ${D}/usr/share/NaturalDocs/
-	cp -pPR Modules Project Styles ${D}/usr/share/NaturalDocs/
-
-	# Make the Perl script executable
-	chmod a+x ${D}/usr/share/NaturalDocs/NaturalDocs
-
-	# Symlink the Perl script into /usr/bin
-	dodir /usr/bin
-	dosym /usr/share/NaturalDocs/NaturalDocs /usr/bin/NaturalDocs
-
-	# Documentation
-	dodoc *.txt
-	dohtml -r Help/*
-}
diff --git a/app-doc/NaturalDocs/NaturalDocs-1.40.ebuild b/app-doc/NaturalDocs/NaturalDocs-1.40.ebuild
new file mode 100644
index 000000000000..37312682ea47
--- /dev/null
+++ b/app-doc/NaturalDocs/NaturalDocs-1.40.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/NaturalDocs/NaturalDocs-1.40.ebuild,v 1.1 2009/03/29 16:33:25 matsuu Exp $
+
+inherit perl-module
+
+MY_P="${PN}-1.4"
+DESCRIPTION="Extensible, multi-language source code documentation generator"
+HOMEPAGE="http://www.naturaldocs.org/"
+SRC_URI="mirror://sourceforge/naturaldocs/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	!<app-doc/NaturalDocs-1.40" # for dosym
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r Styles Info JavaScript
+
+	insinto /etc/${PN}
+	doins -r Config/*
+	dosym /etc/${PN} /usr/share/${PN}/Config
+
+	perlinfo
+	insinto ${VENDOR_LIB}
+	doins -r Modules/NaturalDocs
+	dodir /usr/share/${PN}/Modules
+	dosym ${VENDOR_LIB}/NaturalDocs /usr/share/${PN}/Modules/NaturalDocs
+
+	exeinto /usr/share/${PN}
+	doexe ${PN}
+
+	# Symlink the Perl script into /usr/bin
+	dodir /usr/bin
+	dosym /usr/share/${PN}/${PN} /usr/bin/${PN}
+
+	# Documentation
+	dohtml -r Help/*
+	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/Help
+}