diff options
| author |   Peter Volkov <pva@gentoo.org> | 2011-01-15 22:22:29 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2011-01-15 22:22:29 +0000 |
| commit | c7d33ef1a3d00454480a0d80b8c6223832b680c0 (patch) | |
| tree | 0f8bb4b9df69722d8e7f0b3e092310cf11002d61 /app-text/cuneiform | |
| parent | Remove old dev-perl/Text-CSV to dev-perl/Text-CSV_XS move. Both exist in the ... (diff) | |
| download | gentoo-2-c7d33ef1a3d00454480a0d80b8c6223832b680c0.tar.gz gentoo-2-c7d33ef1a3d00454480a0d80b8c6223832b680c0.tar.bz2 gentoo-2-c7d33ef1a3d00454480a0d80b8c6223832b680c0.zip | |
Version bump, #316795, thank A.C.Heron for report and Aleksandr Yakimov for this job.
(Portage version: 2.1.9.31/cvs/Linux x86_64)
Diffstat (limited to 'app-text/cuneiform')
| -rw-r--r-- | app-text/cuneiform/ChangeLog | 11 | ||||
| -rw-r--r-- | app-text/cuneiform/cuneiform-1.0.0.ebuild (renamed from app-text/cuneiform/cuneiform-0.7.ebuild) | 17 |
2 files changed, 19 insertions, 9 deletions
diff --git a/app-text/cuneiform/ChangeLog b/app-text/cuneiform/ChangeLog index ca004b3260e5..666da2b18941 100644 --- a/app-text/cuneiform/ChangeLog +++ b/app-text/cuneiform/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-text/cuneiform -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/cuneiform/ChangeLog,v 1.2 2009/09/04 10:17:06 pva Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/cuneiform/ChangeLog,v 1.3 2011/01/15 22:22:28 pva Exp $ + +*cuneiform-1.0.0 (15 Jan 2011) + + 15 Jan 2011; Peter Volkov <pva@gentoo.org> -cuneiform-0.7.ebuild, + +cuneiform-1.0.0.ebuild: + Version bump, #316795, thank A.C.Heron for report and Aleksandr Yakimov for + this job. *cuneiform-0.8.0 (04 Sep 2009) diff --git a/app-text/cuneiform/cuneiform-0.7.ebuild b/app-text/cuneiform/cuneiform-1.0.0.ebuild index 949b7035417a..78e9607a6f26 100644 --- a/app-text/cuneiform/cuneiform-0.7.ebuild +++ b/app-text/cuneiform/cuneiform-1.0.0.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/cuneiform/cuneiform-0.7.ebuild,v 1.1 2009/08/16 15:35:24 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/cuneiform/cuneiform-1.0.0.ebuild,v 1.1 2011/01/15 22:22:28 pva Exp $ +EAPI="2" inherit cmake-utils versionator PV_MAJ=$(get_version_component_range 1-2) @@ -15,7 +16,7 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="imagemagick debug" +IUSE="debug +imagemagick" RDEPEND="imagemagick? ( media-gfx/imagemagick )" DEPEND=">=dev-util/cmake-2.6.2 @@ -25,12 +26,14 @@ DOCS="readme.txt" S=${WORKDIR}/${MY_P} -src_unpack(){ - unpack ${A} +src_prepare(){ + # respect LDFLAGS + sed -i 's:\(set[(]CMAKE_SHARED_LINKER_FLAGS "[^"]*\):\1 $ENV{LDFLAGS}:' \ + "${S}/cuneiform_src/CMakeLists.txt" || die "failed to sed for LDFLAGS" # Fix automagic dependencies / linking if ! use imagemagick; then - sed -e '/pkg_check_modules(MAGICK ImageMagick++)/s/^/#DONOTFIND /' \ - -i "${S}/cuneiform_src/Kern/CMakeLists.txt" \ + sed -i "s:find_package(ImageMagick COMPONENTS Magick++):#DONOTFIND:" \ + "${S}/cuneiform_src/CMakeLists.txt" \ || die "Sed for ImageMagick automagic dependency failed." fi } |