diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-06-02 21:58:00 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-06-02 21:58:00 +0000 |
commit | 298a064cbac18a7a40afb3a47dfa230fd976bcea (patch) | |
tree | 72bbbd9777d2d6d6fcb39ee96ec18b6edf243de5 /kde-base/ark | |
parent | Bump to 0.10.0, new slot, ebuild from the GNOME overlay (diff) | |
download | gentoo-2-298a064cbac18a7a40afb3a47dfa230fd976bcea.tar.gz gentoo-2-298a064cbac18a7a40afb3a47dfa230fd976bcea.tar.bz2 gentoo-2-298a064cbac18a7a40afb3a47dfa230fd976bcea.zip |
Drop KDE 4.4
(Portage version: 2.1.9.49/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'kde-base/ark')
-rw-r--r-- | kde-base/ark/ChangeLog | 7 | ||||
-rw-r--r-- | kde-base/ark/ark-4.4.5-r2.ebuild | 35 | ||||
-rw-r--r-- | kde-base/ark/ark-4.4.5.ebuild | 29 | ||||
-rw-r--r-- | kde-base/ark/files/ark-4.4.5-cli7zip.patch | 11 | ||||
-rw-r--r-- | kde-base/ark/files/ark-4.4.5-detect-libarchive-in-proper-place.patch | 25 |
5 files changed, 6 insertions, 101 deletions
diff --git a/kde-base/ark/ChangeLog b/kde-base/ark/ChangeLog index f5b5ad90345d..3b97007b60e6 100644 --- a/kde-base/ark/ChangeLog +++ b/kde-base/ark/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/ark # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.185 2011/06/01 17:33:56 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.186 2011/06/02 21:57:57 dilfridge Exp $ + + 02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ark-4.4.5.ebuild, + -ark-4.4.5-r2.ebuild, -files/ark-4.4.5-cli7zip.patch, + -files/ark-4.4.5-detect-libarchive-in-proper-place.patch: + Drop KDE-4.4 01 Jun 2011; Brent Baude <ranger@gentoo.org> ark-4.6.2.ebuild: Marking ark-4.6.2 ppc stable for bug 354033 diff --git a/kde-base/ark/ark-4.4.5-r2.ebuild b/kde-base/ark/ark-4.4.5-r2.ebuild deleted file mode 100644 index 8ed5ff08138c..000000000000 --- a/kde-base/ark/ark-4.4.5-r2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2011 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-r2.ebuild,v 1.1 2011/05/08 17:26:39 jmbsvicetto 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" - -DEPEND=" - $(add_kdebase_dep libkonq) - sys-libs/zlib - archive? ( >=app-arch/libarchive-2.6.1[bzip2?,lzma?,zlib] ) - lzma? ( app-arch/xz-utils ) -" -RDEPEND="${DEPEND}" - -# detect-libarchive patch - https://bugs.kde.org/show_bug.cgi?id=271553 -PATCHES=( - "${FILESDIR}/${P}-cli7zip.patch" - "${FILESDIR}/${P}-detect-libarchive-in-proper-place.patch" -) - -src_configure() { - mycmakeargs=( - $(cmake-utils_use_with archive LibArchive) - $(cmake-utils_use_with bzip2 BZip2) - $(cmake-utils_use_with lzma LibLZMA) - ) - kde4-meta_src_configure -} diff --git a/kde-base/ark/ark-4.4.5.ebuild b/kde-base/ark/ark-4.4.5.ebuild deleted file mode 100644 index c046575b897f..000000000000 --- a/kde-base/ark/ark-4.4.5.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# 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.ebuild,v 1.6 2010/08/16 19:18:03 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" - -DEPEND=" - $(add_kdebase_dep libkonq) - sys-libs/zlib - archive? ( >=app-arch/libarchive-2.6.1[bzip2?,lzma?,zlib] ) - lzma? ( app-arch/xz-utils ) -" -RDEPEND="${DEPEND}" - -src_configure() { - mycmakeargs=( - $(cmake-utils_use_with archive LibArchive) - $(cmake-utils_use_with bzip2 BZip2) - $(cmake-utils_use_with lzma LibLZMA) - ) - 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 deleted file mode 100644 index a19e6dd267a0..000000000000 --- a/kde-base/ark/files/ark-4.4.5-cli7zip.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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) { diff --git a/kde-base/ark/files/ark-4.4.5-detect-libarchive-in-proper-place.patch b/kde-base/ark/files/ark-4.4.5-detect-libarchive-in-proper-place.patch deleted file mode 100644 index 452830f83a1c..000000000000 --- a/kde-base/ark/files/ark-4.4.5-detect-libarchive-in-proper-place.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/ark/CMakeLists.txt b/ark/CMakeLists.txt -index 6ea72bb..85c5ce0 100644 ---- a/ark/CMakeLists.txt -+++ b/ark/CMakeLists.txt -@@ -1,5 +1,8 @@ - project(ark) - -+macro_optional_find_package(LibArchive) -+macro_log_feature(LIBARCHIVE_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://code.google.com/p/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark.") -+ - configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) - - add_subdirectory(part) -diff --git a/ark/plugins/CMakeLists.txt b/ark/plugins/CMakeLists.txt -index a8c4e44..e3cb9ec 100644 ---- a/ark/plugins/CMakeLists.txt -+++ b/ark/plugins/CMakeLists.txt -@@ -1,7 +1,3 @@ --macro_optional_find_package(LibArchive) -- --macro_log_feature(LIBARCHIVE_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://people.freebsd.org/~kientzle/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark. Make sure it is compiled with gzip support.") -- - if (LIBARCHIVE_FOUND) - if( NOT HAVE_LIBARCHIVE_LZMA_SUPPORT OR NOT HAVE_LIBARCHIVE_XZ_SUPPORT ) - message(STATUS "Your libarchive does not have support for lzma and/or xz archives. libarchive >= 2.7.0 is recommended.") |