diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2009-05-03 07:12:52 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2009-05-03 07:12:52 +0000 |
| commit | 6f6649f8482f2bc429284d050a16c14bdcd38231 (patch) | |
| tree | ef9910530fed2e9ab34bf049b866fdf8db54b6cd /app-arch/p7zip | |
| parent | EAPI=2; work around parallel-make bugs without -j1 (diff) | |
| download | historical-6f6649f8482f2bc429284d050a16c14bdcd38231.tar.gz historical-6f6649f8482f2bc429284d050a16c14bdcd38231.tar.bz2 historical-6f6649f8482f2bc429284d050a16c14bdcd38231.zip | |
Fix build error when wxGTK built with odbc support (bug #267698) and
checking wxGTK USE flags even when USE="-wxwidgets" (bug #267803).
Also, depend on the correct SLOT.
Package-Manager: portage-2.2_rc32/cvs/Linux x86_64
Diffstat (limited to 'app-arch/p7zip')
| -rw-r--r-- | app-arch/p7zip/ChangeLog | 7 | ||||
| -rw-r--r-- | app-arch/p7zip/Manifest | 14 | ||||
| -rw-r--r-- | app-arch/p7zip/p7zip-4.65.ebuild | 10 |
3 files changed, 25 insertions, 6 deletions
diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog index e603b98d4064..d56eec3e0c3d 100644 --- a/app-arch/p7zip/ChangeLog +++ b/app-arch/p7zip/ChangeLog @@ -1,6 +1,11 @@ # 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.108 2009/05/01 20:52:19 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.109 2009/05/03 07:12:52 dirtyepic Exp $ + + 03 May 2009; Ryan Hill <dirtyepic@gentoo.org> p7zip-4.65.ebuild: + Fix build error when wxGTK built with odbc support (bug #267698) and + checking wxGTK USE flags even when USE="-wxwidgets" (bug #267803). + Also, depend on the correct SLOT. 01 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> p7zip-4.65.ebuild: diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest index b1fc60e64ee0..61614a2f7118 100644 --- a/app-arch/p7zip/Manifest +++ b/app-arch/p7zip/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 4.65-hardlink.patch 413 RMD160 49bfa9195ee874f1e6718503919b620b0986a711 SHA1 ed6d221f34f029c2b1cc7d710b78e98e2d310e32 SHA256 187fc9f9ec0160c7b5f6a1bf7394e7d92db1fbebf219a1ea55725d40255256c8 AUX 4.65-makefile.patch 450 RMD160 9f3de770dd3d74d3546c871364ee527bb9c9d3b6 SHA1 7fdcbf714b65c25e5749ee78b34256bba84adee0 SHA256 d36e71be74fdcc3c2afaf2217cb4712f00e3e75f3d23efd6c288f058092c4120 AUX p7zip 1210 RMD160 0f331392eb77077ea6c100011326202661e9b6ab SHA1 b4e1e02081e28ece33d2a8303ee69c5f0e9ad239 SHA256 28d181cd1c43628da0adb485e20f270461b6cf8d743d2187a3380f7799fbc2d5 @@ -6,6 +9,13 @@ 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 3384 RMD160 5618230fe28f6c201b66123d8e50e82796a8348a SHA1 26a76d8862c63ba88668cf89c3274d0bc97574f4 SHA256 b10b455b51acfd8030903836d9ce382cc356301dbf7f7d76eeea68d28549a61c -MISC ChangeLog 13638 RMD160 b521f4e2d1c8072f2c9da94f1af317a4614dcf46 SHA1 84403a1d557119df0f3794a957435ec92f8cec1b SHA256 616b0a31e1295aa256588602f544638d9a14b7e7906403173e34980bda71c31f +EBUILD p7zip-4.65.ebuild 3460 RMD160 63660c8d5160e31d3773af641c67ef076214cdee SHA1 91c5e83a73b1e5ba7bad984a12dfba3af92f5ab9 SHA256 91c986a8016bfd082acfc63b0e6d94d40cae95c835cfdc816a21032549e680f5 +MISC ChangeLog 13883 RMD160 d4d6bbeec0776f758d4db70d84802a7b9582520f SHA1 77cd4adeacb55e571e1bb2140c9f36a135c62609 SHA256 53b9d241a5bcb8ace45aa707cce9f75feaba107f806ebf785314d7bb4d5a450a MISC metadata.xml 300 RMD160 f76ed2c3264d6158356f9bdd432ca52a208df139 SHA1 bf620c137824a1fda712f420057baa45d65c730a SHA256 2f5efaa8198a11a57160098296e657540fd27abd43d6c388c820a070fc1d9da2 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkn9RHgACgkQiqiDRvmkBmJ6wwCfbA5mPhX9ohi8NBoEu725RVUl +G4UAoJ2w2AlSHHcIbkxs3Ukh+koEGlp7 +=p9t+ +-----END PGP SIGNATURE----- diff --git a/app-arch/p7zip/p7zip-4.65.ebuild b/app-arch/p7zip/p7zip-4.65.ebuild index 52e10ff8dd53..225b189a2a66 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.5 2009/05/01 20:52:19 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild,v 1.6 2009/05/03 07:12:52 dirtyepic Exp $ EAPI="2" WX_GTK_VER="2.8" @@ -16,12 +16,16 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="doc kde rar static wxwidgets" -RDEPEND="kde? ( x11-libs/wxGTK[X] || ( kde-base/konqueror kde-base/kdebase-meta kde-base/kdebase ) ) - wxwidgets? ( x11-libs/wxGTK[X] )" +RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] || ( kde-base/konqueror kde-base/kdebase-meta kde-base/kdebase ) ) + wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" DEPEND="${RDEPEND}" S=${WORKDIR}/${PN}_${PV} +pkg_setup() { + use wxwidgets && wxwidgets_pkg_setup +} + src_prepare() { if use kde && ! use wxwidgets ; then einfo "USE-flag kde needs wxwidgets flag" |