diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2011-04-14 18:28:15 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2011-04-14 18:28:15 +0000 |
| commit | 35bc2af45d01e70a8022a15e540a9a2748ed0551 (patch) | |
| tree | 745b04706c2c3482b68f1c8289f847d037ab81e1 /app-office/dia | |
| parent | Clean up old revision. (diff) | |
| download | gentoo-2-35bc2af45d01e70a8022a15e540a9a2748ed0551.tar.gz gentoo-2-35bc2af45d01e70a8022a15e540a9a2748ed0551.tar.bz2 gentoo-2-35bc2af45d01e70a8022a15e540a9a2748ed0551.zip | |
Add prefix support and keywords
(Portage version: 2.2.0_alpha29_p11/cvs/Linux i686)
Diffstat (limited to 'app-office/dia')
| -rw-r--r-- | app-office/dia/ChangeLog | 5 | ||||
| -rw-r--r-- | app-office/dia/dia-0.97.1.ebuild | 16 |
2 files changed, 16 insertions, 5 deletions
diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog index e581e2d15fc5..562c7128ed92 100644 --- a/app-office/dia/ChangeLog +++ b/app-office/dia/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-office/dia # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.130 2011/01/26 14:47:50 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.131 2011/04/14 18:28:15 abcd Exp $ + + 14 Apr 2011; Jonathan Callen <abcd@gentoo.org> dia-0.97.1.ebuild: + Add prefix support and keywords 26 Jan 2011; Pacho Ramos <pacho@gentoo.org> dia-0.97.1.ebuild: Let it compile when python3 is main interpreter. Bump to eapi3. diff --git a/app-office/dia/dia-0.97.1.ebuild b/app-office/dia/dia-0.97.1.ebuild index 60d3bcccd575..50ca7230f07c 100644 --- a/app-office/dia/dia-0.97.1.ebuild +++ b/app-office/dia/dia-0.97.1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.11 2011/01/26 14:47:50 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.12 2011/04/14 18:28:15 abcd Exp $ EAPI="3" GCONF_DEBUG="yes" PYTHON_DEPEND="python? 2" -inherit eutils gnome2 libtool autotools versionator python +inherit eutils gnome2 libtool autotools versionator python multilib MY_P=${P/_/-} DESCRIPTION="Diagram/flowchart creation program" @@ -18,7 +18,7 @@ MY_PV_MM=$(get_version_component_range 1-2) SRC_URI="mirror://gnome/sources/${PN}/${MY_PV_MM}/${MY_P}.tar.bz2" SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" # the doc USE flag doesn't seem to do anything without docbook2html IUSE="cairo doc gnome png python zlib" @@ -58,7 +58,9 @@ pkg_setup() { --without-swig --without-hardbooks --disable-static - --docdir=/usr/share/doc/${PF}" + --docdir=${EPREFIX}/usr/share/doc/${PF} + --exec-prefix=${EPREFIX}/usr" + # --exec-prefix makes Python look for modules in the Prefix use python && python_set_active_version 2 } @@ -71,6 +73,8 @@ src_prepare() { # Fix compilation with USE="python", bug #271855 if use python; then epatch "${FILESDIR}/${PN}-0.97-acinclude-python-fixes.patch" + # use proper shared lib extension, #298232 + sed -i -e "s/\.so/$(get_libname)/" acinclude.m4 || die fi # Skip man generation @@ -79,6 +83,10 @@ src_prepare() { || die "sed 2 failed" fi + # Fix naming conflict on Darwin/OSX + sed -i -e 's/isspecial/char_isspecial/' \ + objects/GRAFCET/boolequation.c || die + # Don't use -DGTK_DISABLE_DEPRECATED, bug #333439 sed -i -e 's:-DGTK_DISABLE_DEPRECATED::g' configure.in || die "sed 3 failed" |