diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2010-08-16 19:06:04 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-08-16 19:06:04 +0000 |
| commit | 37054b05d30eaf94688f95cdb8f0d607d666b382 (patch) | |
| tree | 8d991f9a02e5b3b7e692afa096711c69b79cb448 /kde-base/ark | |
| parent | Not parallel make safe (#333049). Cleanup (diff) | |
| download | historical-37054b05d30eaf94688f95cdb8f0d607d666b382.tar.gz historical-37054b05d30eaf94688f95cdb8f0d607d666b382.tar.bz2 historical-37054b05d30eaf94688f95cdb8f0d607d666b382.zip | |
Add patch to fix bug 332855
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'kde-base/ark')
| -rw-r--r-- | kde-base/ark/ChangeLog | 8 | ||||
| -rw-r--r-- | kde-base/ark/Manifest | 4 | ||||
| -rw-r--r-- | kde-base/ark/ark-4.4.5-r1.ebuild | 34 | ||||
| -rw-r--r-- | kde-base/ark/files/ark-4.4.5-cli7zip.patch | 11 |
4 files changed, 55 insertions, 2 deletions
diff --git a/kde-base/ark/ChangeLog b/kde-base/ark/ChangeLog index 9a39d438ce3b..85333455fb5f 100644 --- a/kde-base/ark/ChangeLog +++ b/kde-base/ark/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/ark # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.165 2010/08/09 17:34:27 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.166 2010/08/16 19:06:04 reavertm Exp $ + +*ark-4.4.5-r1 (16 Aug 2010) + + 16 Aug 2010; Maciej Mrozowski <reavertm@gentoo.org> +ark-4.4.5-r1.ebuild, + +files/ark-4.4.5-cli7zip.patch: + Add patch to fix bug 332855 09 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> ark-4.4.5.ebuild: Drop alpha ia64 and sparc per the AT Lead permission. diff --git a/kde-base/ark/Manifest b/kde-base/ark/Manifest index 09f6d148316e..15ab9b322d95 100644 --- a/kde-base/ark/Manifest +++ b/kde-base/ark/Manifest @@ -1,4 +1,6 @@ +AUX ark-4.4.5-cli7zip.patch 480 RMD160 57369a955bff3038ad0c105eea0179bbb795a030 SHA1 27e94998d9fc7521dde5c09b35ff915dbadcab73 SHA256 b053da2d2844ae532fa62058ca81332fbef10b8fe3114209dc8382e0f9760743 DIST kdeutils-4.4.5.tar.bz2 2694008 RMD160 d8f9014fcd27548a33d10138135a8789d8fd49d6 SHA1 c092cfbb46719d89a5718735dc81ca75c0176e45 SHA256 07ef7d4bab6e919eac89ff0c948410266b120773300a7aa05119d0b23d312495 +EBUILD ark-4.4.5-r1.ebuild 856 RMD160 a88859b4927e9864d1f33b25ddd041d367728a80 SHA1 c6818135ac2a01a4b334d2041b7e0345304057b3 SHA256 f93a166c512fb4d8d36707e8dd142118ae53db16927ae3fd183c5d5e008af8da EBUILD ark-4.4.5.ebuild 804 RMD160 498f7e3370cc9c26b864db5222a90d184dbafb99 SHA1 ff5494a66af9675d8a95450ce0aeaa45e9a75b64 SHA256 f96402159df42f1904b3dfab15eaa36b98de2c7d37f18794356ab1f6500a6e72 -MISC ChangeLog 18720 RMD160 cc046f3469fe59a6f61e2686a161d8e8aff260d5 SHA1 4211e3dfd724ce747a1df5aa911c84a9a665d98b SHA256 c43751bdc83e3c6aab5c793605b4f96982d548c94bab9efa035056f5aea8ee4a +MISC ChangeLog 18889 RMD160 6d55fb43f03ed8b52e9e33f4e3f01c222940bbee SHA1 68ddc058dfad8c66e818d8076b470d5b6519ccf0 SHA256 65bd24f26ac94ad458eae99ad4fff22ff4a75b0776824e3c28fc03da9918a2e9 MISC metadata.xml 381 RMD160 c30a3b9455946839d0a4b7d2261d6dfec597a476 SHA1 0445b8ab3f9938b209437e6a2f2fe27ad3b89dbf SHA256 895b3ed7f652563c376e59cdb10a6646681adc3608f37dbceace0381ae7141df diff --git a/kde-base/ark/ark-4.4.5-r1.ebuild b/kde-base/ark/ark-4.4.5-r1.ebuild new file mode 100644 index 000000000000..cd9173f9baf6 --- /dev/null +++ b/kde-base/ark/ark-4.4.5-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.4.5-r1.ebuild,v 1.1 2010/08/16 19:06:04 reavertm Exp $ + +EAPI="3" + +KMNAME="kdeutils" +inherit kde4-meta + +DESCRIPTION="KDE Archiving tool" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+archive +bzip2 debug +handbook lzma zip" + +DEPEND=" + $(add_kdebase_dep libkonq) + archive? ( >=app-arch/libarchive-2.6.1[bzip2?,lzma?,zlib] ) + lzma? ( app-arch/xz-utils ) + zip? ( >=dev-libs/libzip-0.8 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-cli7zip.patch" +) + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_with archive LibArchive) + $(cmake-utils_use_with bzip2 BZip2) + $(cmake-utils_use_with lzma LibLZMA) + $(cmake-utils_use_with zip LibZip) + ) + kde4-meta_src_configure +} diff --git a/kde-base/ark/files/ark-4.4.5-cli7zip.patch b/kde-base/ark/files/ark-4.4.5-cli7zip.patch new file mode 100644 index 000000000000..a19e6dd267a0 --- /dev/null +++ b/kde-base/ark/files/ark-4.4.5-cli7zip.patch @@ -0,0 +1,11 @@ +--- branches/KDE/4.5/kdeutils/ark/plugins/cli7zplugin/cliplugin.cpp 2010/07/20 23:33:28 1152411 ++++ branches/KDE/4.5/kdeutils/ark/plugins/cli7zplugin/cliplugin.cpp 2010/07/20 23:34:01 1152412 +@@ -78,7 +78,7 @@ + + bool CliPlugin::readListLine(const QString& line) + { +- static const QLatin1String archiveInfoDelimiter("----"); ++ static const QLatin1String archiveInfoDelimiter("--"); + static const QLatin1String entryInfoDelimiter("----------"); + + switch (m_state) { |