diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-27 15:57:26 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-27 15:57:26 +0000 |
| commit | 3646069a71fe411bf808ab9d5c24c4c3181318ea (patch) | |
| tree | 276e17d2fbec9d43b305c838a2c8af26224f2575 /app-arch/p7zip | |
| parent | Stable for HPPA (bug #264514). (diff) | |
| download | gentoo-2-3646069a71fe411bf808ab9d5c24c4c3181318ea.tar.gz gentoo-2-3646069a71fe411bf808ab9d5c24c4c3181318ea.tar.bz2 gentoo-2-3646069a71fe411bf808ab9d5c24c4c3181318ea.zip | |
Few build system updates. Make it work with kde4. At least on my pc it looks like working somehow :]
(Portage version: 2.2_rc30/cvs/Linux x86_64)
Diffstat (limited to 'app-arch/p7zip')
| -rw-r--r-- | app-arch/p7zip/ChangeLog | 5 | ||||
| -rw-r--r-- | app-arch/p7zip/p7zip-4.65.ebuild | 17 |
2 files changed, 13 insertions, 9 deletions
diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog index 966d261935c5..c89bc2054ee3 100644 --- a/app-arch/p7zip/ChangeLog +++ b/app-arch/p7zip/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-arch/p7zip # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.105 2009/04/26 20:59:25 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.106 2009/04/27 15:57:26 scarabeus Exp $ + + 27 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> p7zip-4.65.ebuild: + Few build system updates. Make it work with kde4. *p7zip-4.65 (26 Apr 2009) diff --git a/app-arch/p7zip/p7zip-4.65.ebuild b/app-arch/p7zip/p7zip-4.65.ebuild index 175677673534..3b3ab7a3752b 100644 --- a/app-arch/p7zip/p7zip-4.65.ebuild +++ b/app-arch/p7zip/p7zip-4.65.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild,v 1.2 2009/04/27 01:55:14 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild,v 1.3 2009/04/27 15:57:26 scarabeus Exp $ EAPI="2" WX_GTK_VER="2.8" @@ -17,20 +17,21 @@ KEYWORDS="~amd64 ~x86" IUSE="wxwindows doc kde rar static" RDEPEND="wxwindows? ( x11-libs/wxGTK[X] ) - kde? ( || ( kde-base/konqueror:3.5 kde-base/kdebase-meta:3.5 kde-base/kdebase:3.5 ) )" + kde? ( || ( kde-base/konqueror kde-base/kdebase-meta kde-base/kdebase ) ) + kde? ( !wxwindows? ( x11-libs/wxGTK[X] ) )" DEPEND="${RDEPEND}" S=${WORKDIR}/${PN}_${PV} src_prepare() { if use kde && ! use wxwindows ; then - eerror "USE-flag kde needs wxwindows flag" - die "do USE=\"kde wxwindows\" emerge p7zip" + einfo "USE-flag kde needs wxwindows flag" + einfo "silently enabling wxwindows flag" fi # remove non-free RAR codec if use rar; then - ewarn "Adding nonfree RAR decompressor" + ewarn "Enabling nonfree RAR decompressor" else sed -e '/Rar/d' -i makefile* rm -rf CPP/7zip/Compress/Rar @@ -63,14 +64,14 @@ src_prepare() { src_compile() { emake all3 || die "compilation error" - if use wxwindows; then + if use wxwindows || use kde; then emake 7zG || die "error building GUI" fi } src_test() { emake test_7z test_7zr || die "test failed" - if use wxwindows; then + if use wxwindows || use kde; then emake test_7zG || die "GUI test failed" fi } @@ -81,7 +82,7 @@ src_install() { make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za" make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z" - if use wxwindows; then + if use wxwindows || use kde; then make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG" dobin GUI/p7zipForFilemanager |