summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Arnold <nerdboy@gentoo.org>2009-09-25 18:32:10 +0000
committerSteve Arnold <nerdboy@gentoo.org>2009-09-25 18:32:10 +0000
commit9324b798de64a4272fbc6c46f5373bbb7de0fd80 (patch)
treedb52c71174c953850afeacead19f5d518253913e /app-doc
parentupdated gdal masking to 1.6.0 only (diff)
downloadgentoo-2-9324b798de64a4272fbc6c46f5373bbb7de0fd80.tar.gz
gentoo-2-9324b798de64a4272fbc6c46f5373bbb7de0fd80.tar.bz2
gentoo-2-9324b798de64a4272fbc6c46f5373bbb7de0fd80.zip
Updated to current release (closes bugs 282598 and 283780).
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'app-doc')
-rw-r--r--app-doc/doxygen/ChangeLog9
-rw-r--r--app-doc/doxygen/doxygen-1.6.1.ebuild (renamed from app-doc/doxygen/doxygen-1.6.0.ebuild)18
2 files changed, 16 insertions, 11 deletions
diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 88779e5e139c..526ed4ce0a05 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-doc/doxygen
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.169 2009/08/27 13:55:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.170 2009/09/25 18:32:10 nerdboy Exp $
+
+*doxygen-1.6.1 (25 Sep 2009)
+
+ 25 Sep 2009; Steve Arnold <nerdboy@gentoo.org> -doxygen-1.6.0.ebuild,
+ +doxygen-1.6.1.ebuild:
+ Updated to current release; fixes eigen borkage plus a few other issues
+ (closes bugs 282598 and 283780).
27 Aug 2009; Raúl Porcel <armin76@gentoo.org> doxygen-1.5.8-r1.ebuild:
arm/ia64/sh/s390 stable wrt #263641
diff --git a/app-doc/doxygen/doxygen-1.6.0.ebuild b/app-doc/doxygen/doxygen-1.6.1.ebuild
index dc3a440bb906..a7174c4a8caa 100644
--- a/app-doc/doxygen/doxygen-1.6.0.ebuild
+++ b/app-doc/doxygen/doxygen-1.6.1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.6.0.ebuild,v 1.2 2009/08/27 07:16:43 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.6.1.ebuild,v 1.1 2009/09/25 18:32:10 nerdboy Exp $
-EAPI=1
+EAPI=2
inherit eutils flag-o-matic toolchain-funcs qt4 fdo-mime
@@ -34,16 +34,13 @@ DEPEND=">=sys-apps/sed-4
EPATCH_SUFFIX="patch"
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
# use CFLAGS, CXXFLAGS, LDFLAGS
sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
- || die "sed failed"
+ || die "sed 1 failed"
# Ensure we link to -liconv
if use elibc_FreeBSD; then
@@ -57,7 +54,7 @@ src_unpack() {
# fix final DESTDIR issue
sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
- addon/doxywizard/Makefile.in || die "sed failed"
+ addon/doxywizard/Makefile.in || die "sed 2 failed"
if is-flagq "-O3" ; then
echo
@@ -71,7 +68,7 @@ src_unpack() {
fi
}
-src_compile() {
+src_configure() {
export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
# set ./configure options (prefix, Qt based wizard, docdir)
@@ -99,8 +96,9 @@ src_compile() {
else
./configure ${my_conf} || die 'configure failed'
fi
+}
- # and compile
+src_compile() {
emake all || die 'emake failed'
# generate html and pdf (if tetex in use) documents.