overdue version bump and maintainer update

Package-Manager: portage-2.1.3.11

6 files changed, 113 insertions, 22 deletions

diff --git a/dev-util/astyle/ChangeLog b/dev-util/astyle/ChangeLog
index ff2071bc921b..a97728fa2b93 100644
--- a/dev-util/astyle/ChangeLog
+++ b/dev-util/astyle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/astyle
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.16 2007/02/09 03:00:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.17 2007/10/07 01:31:42 nerdboy Exp $
+
+*astyle-1.21 (07 Oct 2007)
+
+  07 Oct 2007; Steve Arnold <nerdboy@gentoo.org>
+  +files/astyle-1.21-strip.patch, metadata.xml, +astyle-1.21.ebuild:
+  overdue version bump and maintainer update
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 61a814dbfe33..ed2ff18220ba 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX astyle-1.21-strip.patch 555 RMD160 a88439b27146dee7f02a9fc19f5acab26687069a SHA1 2d7db843c96cffd02677b5138234f5a4226ab8a7 SHA256 980f476309adb279bbde0c39225ca30789ef5489c393528d988ee2040b5f1cf5
+MD5 8b93ca259715c92272c05ef4736c63ba files/astyle-1.21-strip.patch 555
+RMD160 a88439b27146dee7f02a9fc19f5acab26687069a files/astyle-1.21-strip.patch 555
+SHA256 980f476309adb279bbde0c39225ca30789ef5489c393528d988ee2040b5f1cf5 files/astyle-1.21-strip.patch 555
 AUX astyle-gcc34.patch 322 RMD160 5172371d64574507e0a22d4496c92fbd183aaa6e SHA1 d2d47fc4e0df5736744be3a569b011f57728d9d9 SHA256 698051a5dd8dffd38ab64858a9cda721defa0a1525e42b37adbbbbcc6d669d6d
 MD5 083d76ed7b9d08e716ece984cebfa865 files/astyle-gcc34.patch 322
 RMD160 5172371d64574507e0a22d4496c92fbd183aaa6e files/astyle-gcc34.patch 322
@@ -10,6 +11,7 @@ MD5 5a7c535b00e6fd40175e7a2fd44d1722 files/cmd-line-fix.diff 5830
 RMD160 59d4e4b085ac8a64ffc6ed3ad91ab9ec4f04ac41 files/cmd-line-fix.diff 5830
 SHA256 9dbc57f6d20ed2a25fc13f19fbc47a8695e8c779d25e21358935fb9e08608c03 files/cmd-line-fix.diff 5830
 DIST astyle_1.15.3.zip 60880 RMD160 ec84150edbe09dcd62ef960f288b688b52553d8b SHA1 51e115d1f84028899fff1725d4c6298d5e191ea4 SHA256 091adc2dbdcc7532c70dfb00e46361271c23726baa9cd0e5e0e3616838693c75
+DIST astyle_1.21_linux.tar.gz 81678 RMD160 929134074557865b95d25b84093851a9240f65ac SHA1 914493e4834183b2544a9baff2898597ab12ef29 SHA256 894ed6838e61977ee846c219c0e0caa2eaf3f6d9f1df4ed354a8cd45c32d0ec2
 EBUILD astyle-1.15.3-r1.ebuild 840 RMD160 cade4c22bff108f990bb9b5aac29f26c42dcd1e6 SHA1 448f7313307b89db89f6a057d0dac693060eb83e SHA256 1215f1cf3f23569f46c51be2a5b4adec854ee6f062f2b55c3570a674d5ebe73a
 MD5 dcec4037fca3074337b870973211da42 astyle-1.15.3-r1.ebuild 840
 RMD160 cade4c22bff108f990bb9b5aac29f26c42dcd1e6 astyle-1.15.3-r1.ebuild 840
@@ -18,24 +20,24 @@ EBUILD astyle-1.15.3.ebuild 808 RMD160 5e8c3b0f0fe7d2eaac6b12533c035a9a10e35f1f
 MD5 38c7342cb828918a1340e4ef3cf07baa astyle-1.15.3.ebuild 808
 RMD160 5e8c3b0f0fe7d2eaac6b12533c035a9a10e35f1f astyle-1.15.3.ebuild 808
 SHA256 1b6c060474365c29fdd1e4cfa881f10b7d873094652740bb57194ebdf99eb469 astyle-1.15.3.ebuild 808
-MISC ChangeLog 1655 RMD160 786e40c08885f96aafcdf3feb27ae9e2a6527d72 SHA1 6f8d33c869fd394a65b49cb7330234edbd40b295 SHA256 9374f577a7db9178bf04ea0ada1b592f0bd50c08cf45de337c0bc0b57065ebe0
-MD5 a69a898d1b6ca912ec59ef078adb28b8 ChangeLog 1655
-RMD160 786e40c08885f96aafcdf3feb27ae9e2a6527d72 ChangeLog 1655
-SHA256 9374f577a7db9178bf04ea0ada1b592f0bd50c08cf45de337c0bc0b57065ebe0 ChangeLog 1655
-MISC metadata.xml 1776 RMD160 cc8e03ad784aad472e13811fce897061b387963d SHA1 83b2360dfac35520124e967ca4d918107b676d10 SHA256 6d3924c8239f1cd872ff1dbcdc4f90371e9c3f7e2620633c1f2906bbca138610
-MD5 46d5b0bbc90863b3fc66de0db2d0b5a9 metadata.xml 1776
-RMD160 cc8e03ad784aad472e13811fce897061b387963d metadata.xml 1776
-SHA256 6d3924c8239f1cd872ff1dbcdc4f90371e9c3f7e2620633c1f2906bbca138610 metadata.xml 1776
+EBUILD astyle-1.21.ebuild 1244 RMD160 5f554d75f5de712605f7985a18cfb609e8996b7a SHA1 26bf49038d882c81f7a74380aa280ef21935f88b SHA256 a10533e957f049a97c00319758b47daae4d8b202776d828eafd3a0a1fd0f7c13
+MD5 441499332de181836dee99807384662d astyle-1.21.ebuild 1244
+RMD160 5f554d75f5de712605f7985a18cfb609e8996b7a astyle-1.21.ebuild 1244
+SHA256 a10533e957f049a97c00319758b47daae4d8b202776d828eafd3a0a1fd0f7c13 astyle-1.21.ebuild 1244
+MISC ChangeLog 1845 RMD160 a7ae5b6dd1aef3f5b9e98e7e6f720e4e2bcdfbed SHA1 0ebc4b534f7d36691902dbb639c9ba9d71705eb6 SHA256 4075e5b2e76f6ef65ec608168e699064e3bca990c13cda8f93ad8b325602ac00
+MD5 4be960cf89fccc8ea22edeeb52483d55 ChangeLog 1845
+RMD160 a7ae5b6dd1aef3f5b9e98e7e6f720e4e2bcdfbed ChangeLog 1845
+SHA256 4075e5b2e76f6ef65ec608168e699064e3bca990c13cda8f93ad8b325602ac00 ChangeLog 1845
+MISC metadata.xml 1751 RMD160 2b19c912e2ed3fffde21fc78e709adfa01f3f306 SHA1 282847bdb605ee83bc032eeb02922d36e13ba90d SHA256 f7b72e8fca0bd5a04e471921afc936fdd51530996f661d3268fd6eb88e50249f
+MD5 a92ed04b384ad3d058985d702ce7ac1d metadata.xml 1751
+RMD160 2b19c912e2ed3fffde21fc78e709adfa01f3f306 metadata.xml 1751
+SHA256 f7b72e8fca0bd5a04e471921afc936fdd51530996f661d3268fd6eb88e50249f metadata.xml 1751
 MD5 e47489a7838e28b93774df509a4c54c0 files/digest-astyle-1.15.3 229
 RMD160 82713ec4e449043c3d096a19503d95e059488115 files/digest-astyle-1.15.3 229
 SHA256 7f2a5579a27e374797243ce2738bff4a0dd6c46637eb53a3dfcebb99f06eda61 files/digest-astyle-1.15.3 229
 MD5 e47489a7838e28b93774df509a4c54c0 files/digest-astyle-1.15.3-r1 229
 RMD160 82713ec4e449043c3d096a19503d95e059488115 files/digest-astyle-1.15.3-r1 229
 SHA256 7f2a5579a27e374797243ce2738bff4a0dd6c46637eb53a3dfcebb99f06eda61 files/digest-astyle-1.15.3-r1 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFy+PcAiZjviIA2XgRAsRFAJ9uor2T2qSrKHobKfn0oIGKJHQhRQCfdEO5
-dFy7z7xGDkgxt4hLWTGDiz4=
-=+Rbs
------END PGP SIGNATURE-----
+MD5 24b2ec9459bc6bf87fd0b6ab15662690 files/digest-astyle-1.21 250
+RMD160 99e575d3eb20833ea2b0792591429766bdc75b5d files/digest-astyle-1.21 250
+SHA256 167457da5b886b840fb6c9795f9e1ca8c5d1830e88c9e47efb16c13b2b9fd1f4 files/digest-astyle-1.21 250
diff --git a/dev-util/astyle/astyle-1.21.ebuild b/dev-util/astyle/astyle-1.21.ebuild
new file mode 100644
index 000000000000..bb7715fe228f
--- /dev/null
+++ b/dev-util/astyle/astyle-1.21.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+inherit eutils
+
+DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code"
+HOMEPAGE="http://astyle.sourceforge.net/"
+SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
+IUSE="debug libs"
+
+DEPEND=""
+RDEPEND=""
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-${PV}-strip.patch
+}
+
+src_compile() {
+	cd build
+	local build_targets="release"
+	if use debug; then
+	    build_targets="debug"
+	    if use libs; then
+		build_targets="debug staticdebug shareddebug"
+	    fi
+	else
+	    if use libs; then
+		build_targets="release static shared"
+	    fi
+	fi
+	make ${build_targets} || die "build failed"
+}
+
+src_install() {
+	if use debug; then
+	    newbin bin/astyled astyle
+	    if use libs; then
+		newlib.a bin/libastyled.a libastyle.a
+		# shared lib needs at least a soname patch
+		newlib.so bin/libastyled.so libastyle.so
+	    fi
+	else
+	    if use libs; then
+		dolib.a bin/libastyle.a
+		dolib.so bin/libastyle.so
+	    fi
+	    dobin bin/astyle
+	fi
+	dohtml doc/*.html
+}
diff --git a/dev-util/astyle/files/astyle-1.21-strip.patch b/dev-util/astyle/files/astyle-1.21-strip.patch
new file mode 100644
index 000000000000..06f9a46159b4
--- /dev/null
+++ b/dev-util/astyle/files/astyle-1.21-strip.patch
@@ -0,0 +1,21 @@
+diff -Naur astyle.orig/build/Makefile astyle/build/Makefile
+--- astyle.orig/build/Makefile	2007-06-14 17:28:24.000000000 +0200
++++ astyle/build/Makefile	2007-10-06 17:43:53.000000000 +0200
+@@ -83,7 +83,7 @@
+ release:  astyle
+ astyle:  $(OBJ)
+ 	@ mkdir -p $(bindir)
+-	$(CXX) -s -o $(bindir)/$@ $^
++	$(CXX) -o $(bindir)/$@ $^
+ 	@ echo
+ 
+ debug:  astyled
+@@ -95,7 +95,7 @@
+ shared:  libastyle.so
+ libastyle.so:  $(OBJs)
+ 	@ mkdir -p $(bindir)
+-	$(CXX) -shared -s -o $(bindir)/$@ $^
++	$(CXX) -shared -o $(bindir)/$@ $^
+ 	@ echo
+ 
+ shareddebug:  libastyled.so
diff --git a/dev-util/astyle/files/digest-astyle-1.21 b/dev-util/astyle/files/digest-astyle-1.21
new file mode 100644
index 000000000000..4ba89d3583e1
--- /dev/null
+++ b/dev-util/astyle/files/digest-astyle-1.21
@@ -0,0 +1,3 @@
+MD5 c3e2068e9bf64bcad3e1d69628c4d241 astyle_1.21_linux.tar.gz 81678
+RMD160 929134074557865b95d25b84093851a9240f65ac astyle_1.21_linux.tar.gz 81678
+SHA256 894ed6838e61977ee846c219c0e0caa2eaf3f6d9f1df4ed354a8cd45c32d0ec2 astyle_1.21_linux.tar.gz 81678
diff --git a/dev-util/astyle/metadata.xml b/dev-util/astyle/metadata.xml
index a7ec0b429790..fb77ba8abe2e 100644
--- a/dev-util/astyle/metadata.xml
+++ b/dev-util/astyle/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>dev-tools</herd>
 <maintainer>
-  <email>karltk@gentoo.org</email>
-  <description>Temporary maintainer, looking for replacements</description>
+  <email>nerdboy@gentoo.org</email>
+  <description>Primary maintainer</description>
 </maintainer>
 
 <longdescription>