diff options
| author |   Jakub Moc <jakub@gentoo.org> | 2007-08-04 13:54:38 +0000 |
|---|---|---|
| committer | Jakub Moc <jakub@gentoo.org> | 2007-08-04 13:54:38 +0000 |
| commit | 122e77ea47171c8239fc8d4b9d60abb21c159990 (patch) | |
| tree | 116b3dcfa117a890d094ed300d7be71ef3d8e068 /media-gfx | |
| parent | dev-util/qdevelop: Use pkg_setup from qt4 eclass for built_with_use check (diff) | |
| download | sunrise-122e77ea47171c8239fc8d4b9d60abb21c159990.tar.gz sunrise-122e77ea47171c8239fc8d4b9d60abb21c159990.tar.bz2 sunrise-122e77ea47171c8239fc8d4b9d60abb21c159990.zip | |
media-gfx/ipe: Drop redundant die, use pkg_setup from qt4 eclass for built_with_use check
svn path=/sunrise/; revision=4376
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/ipe/ChangeLog | 3 | ||||
| -rw-r--r-- | media-gfx/ipe/Manifest | 4 | ||||
| -rw-r--r-- | media-gfx/ipe/ipe-6.0_pre28.ebuild | 16 |
3 files changed, 11 insertions, 12 deletions
diff --git a/media-gfx/ipe/ChangeLog b/media-gfx/ipe/ChangeLog index b22c95be0..29d458d27 100644 --- a/media-gfx/ipe/ChangeLog +++ b/media-gfx/ipe/ChangeLog @@ -3,6 +3,9 @@ # $Header: $ 04 Aug 2007; Jakub Moc <jakub@gentoo.org> ipe-6.0_pre28.ebuild: + Drop redundant die, use pkg_setup from qt4 eclass for built_with_use check + + 04 Aug 2007; Jakub Moc <jakub@gentoo.org> ipe-6.0_pre28.ebuild: Use eqmake4 from qt4 eclass 01 Jul 2007; Jakub Moc <jakub@gentoo.org> ipe-6.0_pre28.ebuild: diff --git a/media-gfx/ipe/Manifest b/media-gfx/ipe/Manifest index b9c6f560d..c7f672501 100644 --- a/media-gfx/ipe/Manifest +++ b/media-gfx/ipe/Manifest @@ -1,4 +1,4 @@ DIST ipe-6.0pre28-src.tar.gz 960391 RMD160 83efafe9bf07646dc95b289629f97bd09f55e0d5 SHA1 81570659309727e95b83a9a2d00d34dac255cd07 SHA256 f567973352400d2a4fddda3e5e724bf05ede1e5f6ab9e6b91cbf79c472566e55 -EBUILD ipe-6.0_pre28.ebuild 2275 RMD160 e909508a119f711bb208358717c2dec0284dde94 SHA1 b4a9e2d88ed3931e87ef67836f20cc924c8f3aab SHA256 c644b93e4240127e5695d13186cc0453a575f087eb8682f2c14286302b74a274 -MISC ChangeLog 1795 RMD160 edab1b8f52c6e763941a9a85385a764ed2047c97 SHA1 660455a2d82f74acedb3d6dfa053e421e9871e8f SHA256 d7c95b4f32d4f20341381b78f496d424ee19832fb52657ac6a953c785d76adec +EBUILD ipe-6.0_pre28.ebuild 2106 RMD160 fc8843e6076b7696a09a7728ec39e4a600bdd1b9 SHA1 390ca591a7d60a5a6cd7ac43a4b8566c9e823fd2 SHA256 81d38a90da5c4874ee436ab8ee8260b60133ed211f3f1d2f231fff24969fe91a +MISC ChangeLog 1939 RMD160 ff597de56f9edb6a177c2e58ee3047416a86cedc SHA1 88e1749de5db1c79690de0b7643d86ad8d3de662 SHA256 34597b53572793bf6cddfb107a6ce1ed410a4deb1cd24fd1a7dd8e76259eb89a MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/media-gfx/ipe/ipe-6.0_pre28.ebuild b/media-gfx/ipe/ipe-6.0_pre28.ebuild index 3f76f9e1b..093cd70c9 100644 --- a/media-gfx/ipe/ipe-6.0_pre28.ebuild +++ b/media-gfx/ipe/ipe-6.0_pre28.ebuild @@ -22,6 +22,7 @@ RDEPEND="${DEPEND} firefox? ( || ( www-client/mozilla-firefox www-client/mozilla-firefox-bin ) )" + S="${WORKDIR}/${MY_P}/src" search_urw_fonts() { @@ -39,11 +40,9 @@ search_urw_fonts() { } pkg_setup() { - if has_version ">=x11-libs/qt-4.2.2" && ! built_with_use x11-libs/qt qt3support; then - eerror - eerror "You need to rebuild x11-libs/qt with USE=qt3support enabled" - eerror - die "please rebuild x11-libs/qt with USE=qt3support" + if has_version ">=x11-libs/qt-4.2.2" ; then + QT4_BUILT_WITH_USE_CHECK="qt3support" + qt4_pkg_setup fi search_urw_fonts @@ -62,12 +61,9 @@ src_compile() { use firefox && \ sed -i -e "s/IPEBROWSER = mozilla/IPEBROWSER = firefox/" config.pri - eqmake4 \ + eqmake4 main.pro \ "IPEPREFIX=/usr" \ - "IPEDOCDIR=/usr/share/doc/${PF}" \ - ${myconf} \ - main.pro || die "qmake failed" - + "IPEDOCDIR=/usr/share/doc/${PF}" emake || die "emake failed" } |