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 | 09d035832345687af5ec4278a177ee20060eed32 (patch) | |
| tree | 58a2e4b45479c345f83003279df9e4e0edde2557 | |
| parent | Stable for HPPA (bug #264514). (diff) | |
| download | historical-09d035832345687af5ec4278a177ee20060eed32.tar.gz historical-09d035832345687af5ec4278a177ee20060eed32.tar.bz2 historical-09d035832345687af5ec4278a177ee20060eed32.zip | |
Few build system updates. Make it work with kde4. At least on my pc it looks like working somehow :]
Package-Manager: portage-2.2_rc30/cvs/Linux x86_64
| -rw-r--r-- | app-arch/p7zip/ChangeLog | 5 | ||||
| -rw-r--r-- | app-arch/p7zip/Manifest | 4 | ||||
| -rw-r--r-- | app-arch/p7zip/p7zip-4.65.ebuild | 17 |
3 files changed, 15 insertions, 11 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/Manifest b/app-arch/p7zip/Manifest index af44cc1fa59a..b63872a822ee 100644 --- a/app-arch/p7zip/Manifest +++ b/app-arch/p7zip/Manifest @@ -6,6 +6,6 @@ DIST p7zip_4.58_src_all.tar.bz2 1948207 RMD160 2c31ab657275dc01d2d23c5de2327d5ee DIST p7zip_4.65_src_all.tar.bz2 2501418 RMD160 1749032c16e7c5afaa79bc123db33d61acc79eba SHA1 988f6ec63e93e6ec23492fd39e3b48a58fd695d1 SHA256 691cc9419a73a9348319f5b2c3ba2655471bee052c6c7fa57a226800c89ab07f EBUILD p7zip-4.57.ebuild 2524 RMD160 8559df68a75b045a97cf4de50a521f6797097483 SHA1 d18c522002c6240cd6db595fce9b2b6c8d1ca113 SHA256 9f83a19a9e06732263b4b7879be8f78f21b992382c234eac7f1bc2631cab23f7 EBUILD p7zip-4.58.ebuild 2276 RMD160 9755629c5d99b60afae5b56a64b1d0407b3c9b3e SHA1 e8de5f15c4b1850068e7134de55425633334adda SHA256 4e87189dfefe899161a7aaa8349d9a2a7842b219185e50b8ef0cb9359b42e3fd -EBUILD p7zip-4.65.ebuild 3300 RMD160 493d91694e4266277eaf6c1adb204218a59f621c SHA1 fab6b20494e88bdbfe81e97239f90ca9093429e8 SHA256 9ee193459e4e6c95d94f4cce4e9876267c02cb8932134ec6b5e1da4294c29ecf -MISC ChangeLog 13277 RMD160 bf8a4632848b3ace13ee5c623d15eb27ced5d693 SHA1 b4baa228516713b4a6ddbe9ac7149d91a8f6b10b SHA256 2e745924198ccc78bc90c61af29d0a74a6aee75e9a3f0c2a8dce58da7ad13c8e +EBUILD p7zip-4.65.ebuild 3363 RMD160 f9c80e9b834c7c361666629d5ba16fb0dd563fbb SHA1 1277e6576e2638e7fe0db5502d96b176026839fa SHA256 9a078cdade199b5a4312878db68941f18fd1c568f7fba41343da6288d14f22ff +MISC ChangeLog 13403 RMD160 6a90be8080aa2ad81b9054d8967f65fb078f07f3 SHA1 2f35b2e2d253cc28b86c0957cf87974eb8bb2581 SHA256 cda88e1597b7b2ac019a1b314492cc7a1ee7c966e4665f34ee454d8bbad9963b MISC metadata.xml 300 RMD160 f76ed2c3264d6158356f9bdd432ca52a208df139 SHA1 bf620c137824a1fda712f420057baa45d65c730a SHA256 2f5efaa8198a11a57160098296e657540fd27abd43d6c388c820a070fc1d9da2 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 |