summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2009-04-22 15:35:26 +0000
committerChristian Ruppert <idl0r@gentoo.org>2009-04-22 15:35:26 +0000
commit1fe0cc2df21833f095411d8c455970c03b1b6047 (patch)
tree039a481ad8e786163357f9c24f818db016394ca7 /x11-misc
parentRemoved entries for media-sound/mtag-9999 and net-misc/ypd-9999. (diff)
downloadsunrise-1fe0cc2df21833f095411d8c455970c03b1b6047.tar.gz
sunrise-1fe0cc2df21833f095411d8c455970c03b1b6047.tar.bz2
sunrise-1fe0cc2df21833f095411d8c455970c03b1b6047.zip
x11-misc/kxstitch: Reverted commit r8356 until the kde eclass is EAPI 2 ready.
svn path=/sunrise/; revision=8387
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/kxstitch/ChangeLog3
-rw-r--r--x11-misc/kxstitch/Manifest4
-rw-r--r--x11-misc/kxstitch/kxstitch-0.8.ebuild15
3 files changed, 16 insertions, 6 deletions
diff --git a/x11-misc/kxstitch/ChangeLog b/x11-misc/kxstitch/ChangeLog
index 7bc82433e..5058adcf3 100644
--- a/x11-misc/kxstitch/ChangeLog
+++ b/x11-misc/kxstitch/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 Apr 2009; Christian Ruppert <idl0r@gentoo.org> kxstitch-0.8.ebuild:
+ Reverted commit r8356 until the kde eclass is EAPI 2 ready.
+
20 Apr 2009; Christian Ruppert <idl0r@gentoo.org> kxstitch-0.8.ebuild:
Replaced build_with_use by EAPI 2 USE dependencies.
diff --git a/x11-misc/kxstitch/Manifest b/x11-misc/kxstitch/Manifest
index c9848dfcc..1f5713313 100644
--- a/x11-misc/kxstitch/Manifest
+++ b/x11-misc/kxstitch/Manifest
@@ -1,4 +1,4 @@
DIST kxstitch-0.8.tar.bz2 992146 RMD160 3f38c3f96452b6a0b8d01b03f5fef7f84a2f7823 SHA1 da28607290b6837fb0aeae24f1e0bac31ad7c71f SHA256 13ed87d05237565e5a845edc2b60c858d6e5302f830709da6099847cf2cd13b1
-EBUILD kxstitch-0.8.ebuild 496 RMD160 d0ff90392b210b7fe9abd322de19915a3a0939a0 SHA1 c788b02973690878866716b815deff68dc8804b3 SHA256 c99d3dce5a6c5d4e6f4ebed02a9cf51a72939ac3d4f6fa1ec8ae7ef899807a47
-MISC ChangeLog 487 RMD160 13a6447321841f625ed726d39552aac2954e3a57 SHA1 c3be9da31490b859846513e96c4e3aafe302ee98 SHA256 489e9b6fd895c00635ad387cb2d0585d3deb9a2be52f18cea22e2c5dd7e77cb6
+EBUILD kxstitch-0.8.ebuild 812 RMD160 447f05fc9520d16b9dd85a0703c74b88eebff57c SHA1 44e912685879e0a8397913dc0ba8f1034635eb05 SHA256 0c2b7ba6b1f4c31281fd480b0856c778647aeb2f58fb5ce21b8289970656ebff
+MISC ChangeLog 623 RMD160 e76ebca495726490e1242ff9aa661c3076b53e2a SHA1 0958ae3933ade7301a908effb6e00e3772ad2556 SHA256 d280167b5961507cd888e21904465319fc53668c80a3de135a842bcb00b00c03
MISC metadata.xml 811 RMD160 593413b7c785c1f34c8424ba1b0a3e53d561b018 SHA1 bae33c9df69dfe29cb35df89122ac3f4c95f91ac SHA256 3b235d8eff27c6dd64f2fd62b0b0cd2f93425cf7565438cb46576a808230feb1
diff --git a/x11-misc/kxstitch/kxstitch-0.8.ebuild b/x11-misc/kxstitch/kxstitch-0.8.ebuild
index f00824c88..e30b871d4 100644
--- a/x11-misc/kxstitch/kxstitch-0.8.ebuild
+++ b/x11-misc/kxstitch/kxstitch-0.8.ebuild
@@ -2,9 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
-
-inherit kde
+inherit eutils kde
DESCRIPTION="A program to create cross stitch patterns and charts"
HOMEPAGE="http://kxstitch.sourceforge.net/"
@@ -15,6 +13,15 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="imagemagick scanner"
-DEPEND="imagemagick? ( media-gfx/imagemagick[-nocxx] )
+DEPEND="imagemagick? ( media-gfx/imagemagick )
scanner? ( media-gfx/sane-backends )"
RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ if use imagemagick && built_with_use media-gfx/imagemagick nocxx ; then
+ eerror "Building kxstitch requires imagemagcik built without"
+ eerror "the nocxx use flag to build magick++ (the C++ API)."
+ eerror "Please re-emerge imagemagick with this use flag disabled."
+ die "imagemagick missing magick++"
+ fi
+}