diff options
| -rw-r--r-- | dev-util/astyle/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/astyle/Manifest | 7 | ||||
| -rw-r--r-- | dev-util/astyle/astyle-1.15.3-r1.ebuild | 5 | ||||
| -rw-r--r-- | dev-util/astyle/astyle-1.15.3.ebuild | 5 | ||||
| -rw-r--r-- | dev-util/astyle/files/astyle-gcc34.patch | 10 |
5 files changed, 28 insertions, 6 deletions
diff --git a/dev-util/astyle/ChangeLog b/dev-util/astyle/ChangeLog index 327bfb85998a..9aa9442f9950 100644 --- a/dev-util/astyle/ChangeLog +++ b/dev-util/astyle/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/astyle # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.9 2004/06/25 02:19:41 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.10 2004/09/26 23:17:46 sekretarz Exp $ + + 27 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org> + +files/astyle-gcc34.patch, astyle-1.15.3-r1.ebuild, astyle-1.15.3.ebuild: + Fixed gcc-3.4 compile issues. Thanks to Igor V. Kovalenko <garrison@mail.ru> + in Bug #63811 28 Mar 2004; David Holm <dholm@gentoo.org> astyle-1.15.3-r1.ebuild: Added to ~ppc. diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest index 01e519947ea3..d0a7a3c93324 100644 --- a/dev-util/astyle/Manifest +++ b/dev-util/astyle/Manifest @@ -1,7 +1,8 @@ -MD5 647a89bb37b16bfb465a3175e202ff3b astyle-1.15.3.ebuild 752 -MD5 2486e30d975c3758862e6ad8fc2b91fc astyle-1.15.3-r1.ebuild 759 -MD5 c74d4d5a6355af7d78f887010ad1cf6f ChangeLog 787 +MD5 94ae9a228d38ad94c134200d975dc9c5 astyle-1.15.3.ebuild 806 +MD5 9bb73cbbad4b769759c83205b297a26a astyle-1.15.3-r1.ebuild 813 +MD5 0c34e704cd1be3a9e50255677e0dda5f ChangeLog 1015 MD5 46d5b0bbc90863b3fc66de0db2d0b5a9 metadata.xml 1776 MD5 bd899893389cf752795753436a7d20e3 files/digest-astyle-1.15.3-r1 61 +MD5 083d76ed7b9d08e716ece984cebfa865 files/astyle-gcc34.patch 322 MD5 5a7c535b00e6fd40175e7a2fd44d1722 files/cmd-line-fix.diff 5830 MD5 bd899893389cf752795753436a7d20e3 files/digest-astyle-1.15.3 61 diff --git a/dev-util/astyle/astyle-1.15.3-r1.ebuild b/dev-util/astyle/astyle-1.15.3-r1.ebuild index ebcc7e3c9482..7fb136afd615 100644 --- a/dev-util/astyle/astyle-1.15.3-r1.ebuild +++ b/dev-util/astyle/astyle-1.15.3-r1.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-util/astyle/astyle-1.15.3-r1.ebuild,v 1.4 2004/06/25 02:19:41 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.15.3-r1.ebuild,v 1.5 2004/09/26 23:17:46 sekretarz Exp $ inherit eutils @@ -20,6 +20,9 @@ S=${WORKDIR} src_unpack() { unpack ${A} epatch ${FILESDIR}/cmd-line-fix.diff + + #gcc-3.4 fix + epatch ${FILESDIR}/${PN}-gcc34.patch } src_compile() { diff --git a/dev-util/astyle/astyle-1.15.3.ebuild b/dev-util/astyle/astyle-1.15.3.ebuild index 535c933763bb..a3838ff70f12 100644 --- a/dev-util/astyle/astyle-1.15.3.ebuild +++ b/dev-util/astyle/astyle-1.15.3.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-util/astyle/astyle-1.15.3.ebuild,v 1.12 2004/06/25 02:19:41 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.15.3.ebuild,v 1.13 2004/09/26 23:17:46 sekretarz Exp $ inherit eutils @@ -20,6 +20,9 @@ S=${WORKDIR} src_unpack() { unpack ${A} epatch ${FILESDIR}/cmd-line-fix.diff + + #gcc-3.4 fix + epatch ${FILESDIR}/${PN}-gcc34.patch } src_compile() { diff --git a/dev-util/astyle/files/astyle-gcc34.patch b/dev-util/astyle/files/astyle-gcc34.patch new file mode 100644 index 000000000000..50b7e8631cc4 --- /dev/null +++ b/dev-util/astyle/files/astyle-gcc34.patch @@ -0,0 +1,10 @@ +--- astyle_main.cpp~ 2004-05-01 18:42:25.026637744 +0400 ++++ astyle_main.cpp 2004-05-01 18:45:39.716040456 +0400 +@@ -53,6 +53,7 @@ + + const string _version = "1.15.3"; + ++bool parseOption(ASFormatter &formatter, const string &arg, const string &errorInfo); + + class ASStreamIterator : + public ASSourceIterator |