summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2011-01-15 22:22:29 +0000
committerPeter Volkov <pva@gentoo.org>2011-01-15 22:22:29 +0000
commit045474b2ff99f8ada66bf84be17965e78636bea1 (patch)
tree54e3d68f3fa08f30b6589b8782c07f4e90b74c76 /app-text/cuneiform
parentRemove old dev-perl/Text-CSV to dev-perl/Text-CSV_XS move. Both exist in the ... (diff)
downloadhistorical-045474b2ff99f8ada66bf84be17965e78636bea1.tar.gz
historical-045474b2ff99f8ada66bf84be17965e78636bea1.tar.bz2
historical-045474b2ff99f8ada66bf84be17965e78636bea1.zip
Version bump, #316795, thank A.C.Heron for report and Aleksandr Yakimov for this job.
Package-Manager: portage-2.1.9.31/cvs/Linux x86_64
Diffstat (limited to 'app-text/cuneiform')
-rw-r--r--app-text/cuneiform/ChangeLog11
-rw-r--r--app-text/cuneiform/Manifest6
-rw-r--r--app-text/cuneiform/cuneiform-1.0.0.ebuild (renamed from app-text/cuneiform/cuneiform-0.7.ebuild)17
3 files changed, 22 insertions, 12 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/Manifest b/app-text/cuneiform/Manifest
index dda62d315411..3df6984a8e92 100644
--- a/app-text/cuneiform/Manifest
+++ b/app-text/cuneiform/Manifest
@@ -1,6 +1,6 @@
-DIST cuneiform-linux-0.7.tar.bz2 29158105 RMD160 69518e03fc813e4fc11ab99cd07561e14cf96783 SHA1 c84877e20f9e73f386b9351679681b42bf0e2eb4 SHA256 c2d250467e05336dcfd4ef5df5ed39ad803966b64c8b57afdc4677a410f5fcec
DIST cuneiform-linux-0.8.0.tar.bz2 26816146 RMD160 29e2ba3e1865643bd1c2cf559c29bc8a88875a49 SHA1 1627f5d3cd7c8d4fac476fbe749e5593e4460ff0 SHA256 874e9078fa41d6bd21e7b419ad931f9bf88ad61f8d3da4b7464d8cdb52c7be8f
-EBUILD cuneiform-0.7.ebuild 1031 RMD160 bcd916d9e4a2db08c63e244c506ad1ed82afc4c3 SHA1 afc0e2406d0e74fcee61c7443a48b81caf6a836e SHA256 2fd37a27ae91cdd48a4acd0e64f6f1edf9413e35e1f69cae2b60b0fcf011c2ea
+DIST cuneiform-linux-1.0.0.tar.bz2 26387208 RMD160 22c1dc2cbdfd150892af144e0b95103fd13c8ae2 SHA1 bdf8bcb3ee578f21032e1f6b6d557e9902f0af77 SHA256 bfa7acc6aade966ab62bc0f19e0ac1a843b659a70202229570c087ca8b15f39e
EBUILD cuneiform-0.8.0.ebuild 1192 RMD160 407ab570cf80656c88f3dd3452f7db6b1f03a356 SHA1 81c0d9ffba28f18eaa27b47bf0e9ccfe95ac307d SHA256 9f281459eef3210eab68405be6e4166db812b6e993fd2123d5319bcf6ac304a3
-MISC ChangeLog 2437 RMD160 9c65fd1cbc19cf490240550cc181476daf4a7a5f SHA1 d41b4844db01941c591d573ee1d94c10103a18bb SHA256 d693bab712307ae258a3d06f0d82d96c6a834c5a09804f9f457597d4b39978c7
+EBUILD cuneiform-1.0.0.ebuild 1192 RMD160 c9e0eba1cf3c421721da4afa3bea47e29cb296bd SHA1 0395d218fc73c4d8d6a704eff3c17440de3916b4 SHA256 af7a0aeb728e9fbcff2fed67516792f89959385c9fcef41b1219ddfed4f3b1dc
+MISC ChangeLog 2655 RMD160 6afd8ff84163b959293bd9e514332c54eb9ea31d SHA1 1a4f057a71c2f8098dd5e2a3aa8a25268dc08f54 SHA256 9b4672aaf0bc8a70fda8a245ba93553d6223f2b4b55e07d2a8b3bcffa51ec486
MISC metadata.xml 639 RMD160 ed2d7707ba1b70533a06614d03342520c75e383a SHA1 a54cbbb45e95884de366c71e20f55c0ace4010fd SHA256 4079478a14c7b349b901e98fc51ee297497b47b0b4d010ce408240e075ad5ab8
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
}