diff options
author | Sergey Popov <pinkbyte@gentoo.org> | 2014-01-30 10:49:03 +0000 |
---|---|---|
committer | Sergey Popov <pinkbyte@gentoo.org> | 2014-01-30 10:49:03 +0000 |
commit | aa3768e993eb79f6642a85a012f6993e9948d9e1 (patch) | |
tree | 4490aa80dd606dc6c99f00e19628396fd4d387b3 /net-p2p | |
parent | Fix compilation with USE=apache2 (bug #499482), add support for mono (bug #47... (diff) | |
download | gentoo-2-aa3768e993eb79f6642a85a012f6993e9948d9e1.tar.gz gentoo-2-aa3768e993eb79f6642a85a012f6993e9948d9e1.tar.bz2 gentoo-2-aa3768e993eb79f6642a85a012f6993e9948d9e1.zip |
Drop old
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'net-p2p')
-rw-r--r-- | net-p2p/eiskaltdcpp/ChangeLog | 7 | ||||
-rw-r--r-- | net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.8-r1.ebuild | 135 | ||||
-rw-r--r-- | net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.8.ebuild | 134 | ||||
-rw-r--r-- | net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.7-boost-1.50.patch | 26 | ||||
-rw-r--r-- | net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.8-sr-latin.patch | 25 |
5 files changed, 6 insertions, 321 deletions
diff --git a/net-p2p/eiskaltdcpp/ChangeLog b/net-p2p/eiskaltdcpp/ChangeLog index f0add5093d7d..3172e98dbf94 100644 --- a/net-p2p/eiskaltdcpp/ChangeLog +++ b/net-p2p/eiskaltdcpp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-p2p/eiskaltdcpp # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.60 2014/01/18 18:48:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.61 2014/01/30 10:49:03 pinkbyte Exp $ + + 30 Jan 2014; Sergey Popov <pinkbyte@gentoo.org> + -files/eiskaltdcpp-2.2.7-boost-1.50.patch, -eiskaltdcpp-2.2.8.ebuild, + -eiskaltdcpp-2.2.8-r1.ebuild, -files/eiskaltdcpp-2.2.8-sr-latin.patch: + Drop old 18 Jan 2014; Pacho Ramos <pacho@gentoo.org> eiskaltdcpp-2.2.9.ebuild: amd64 stable, bug #487658 diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.8-r1.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.8-r1.ebuild deleted file mode 100644 index b06910a18e11..000000000000 --- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.8-r1.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.8-r1.ebuild,v 1.5 2013/09/04 18:53:49 pinkbyte Exp $ - -EAPI="5" - -LANGS="be bg cs de el en es fr hu it pl pt_BR ru sk sr@latin uk" - -[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS="" -inherit cmake-utils ${VCS_ECLASS} - -DESCRIPTION="Qt4 based client for DirectConnect and ADC protocols, based on DC++ library" -HOMEPAGE="http://eiskaltdc.googlecode.com/" - -LICENSE="GPL-2 GPL-3" -SLOT="0" -IUSE="cli daemon dbus +dht +emoticons examples -gtk idn -javascript json libcanberra libnotify lua +minimal pcre +qt4 sound spell sqlite upnp -xmlrpc" -for x in ${LANGS}; do - IUSE="${IUSE} linguas_${x}" -done - -REQUIRED_USE=" - cli? ( ^^ ( json xmlrpc ) ) - emoticons? ( || ( gtk qt4 ) ) - dbus? ( qt4 ) - javascript? ( qt4 ) - json? ( !xmlrpc ) - libcanberra? ( gtk ) - libnotify? ( gtk ) - spell? ( qt4 ) - sound? ( || ( gtk qt4 ) ) - sqlite? ( qt4 ) -" - -if [[ ${PV} != *9999* ]]; then - SRC_URI="http://${PN/pp/}.googlecode.com/files/${P}.tar.xz" - KEYWORDS="amd64 x86" -else - EGIT_REPO_URI="git://github.com/${PN}/${PN}.git" - KEYWORDS="" -fi - -RDEPEND=" - app-arch/bzip2 - >=dev-libs/boost-1.38 - >=dev-libs/openssl-0.9.8 - sys-apps/attr - sys-devel/gettext - sys-libs/zlib - virtual/libiconv - idn? ( net-dns/libidn ) - lua? ( >=dev-lang/lua-5.1 ) - pcre? ( >=dev-libs/libpcre-4.2 ) - upnp? ( >=net-libs/miniupnpc-1.6 ) - cli? ( - >=dev-lang/perl-5.10 - perl-core/Getopt-Long - dev-perl/Data-Dump - dev-perl/Term-ShellUI - json? ( dev-perl/JSON-RPC ) - xmlrpc? ( dev-perl/RPC-XML ) - ) - daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) ) - gtk? ( - x11-libs/pango - x11-libs/gtk+:3 - >=dev-libs/glib-2.24:2 - x11-themes/hicolor-icon-theme - libcanberra? ( media-libs/libcanberra ) - libnotify? ( >=x11-libs/libnotify-0.4.1 ) - ) - qt4? ( - >=dev-qt/qtgui-4.6.0:4 - dbus? ( >=dev-qt/qtdbus-4.6.0:4 ) - javascript? ( - dev-qt/qtscript:4 - x11-libs/qtscriptgenerator - ) - spell? ( app-text/aspell ) - sqlite? ( dev-qt/qtsql:4[sqlite] ) - ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" -DOCS="AUTHORS ChangeLog.txt" -PATCHES=( "${FILESDIR}"/${P}-sr-latin.patch ) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \ - && die "Sorry, but gcc-4.4 and earlier won't work." - fi -} - -src_configure() { - # linguas - local langs x - for x in ${LANGS}; do - use linguas_${x} && langs+=" ${x}" - done - - local mycmakeargs=( - -DLIB_INSTALL_DIR="$(get_libdir)" - -Dlinguas="${langs}" - -DLOCAL_MINIUPNP=OFF - -DUSE_GTK=OFF - -DUSE_LIBGNOME2=OFF - "$(use cli && cmake-utils_use json USE_CLI_JSONRPC)" - "$(use cli && cmake-utils_use xmlrpc USE_CLI_XMLRPC)" - "$(cmake-utils_use daemon NO_UI_DAEMON)" - "$(use daemon && cmake-utils_use json JSONRPC_DAEMON)" - "$(use daemon && cmake-utils_use xmlrpc XMLRPC_DAEMON)" - "$(cmake-utils_use dbus DBUS_NOTIFY)" - "$(cmake-utils_use dht WITH_DHT)" - "$(cmake-utils_use emoticons WITH_EMOTICONS)" - "$(cmake-utils_use examples WITH_EXAMPLES)" - "$(cmake-utils_use gtk USE_GTK3)" - "$(cmake-utils_use idn USE_IDNA)" - "$(cmake-utils_use javascript USE_JS)" - "$(cmake-utils_use libcanberra LIBCANBERRA)" - "$(cmake-utils_use libnotify USE_LIBNOTIFY)" - "$(cmake-utils_use lua LUA_SCRIPT)" - "$(cmake-utils_use lua WITH_LUASCRIPTS)" - "$(cmake-utils_use !minimal WITH_DEV_FILES)" - "$(cmake-utils_use pcre PERL_REGEX)" - "$(cmake-utils_use qt4 USE_QT)" - "$(cmake-utils_use sound WITH_SOUNDS)" - "$(cmake-utils_use spell USE_ASPELL)" - "$(cmake-utils_use sqlite USE_QT_SQLITE)" - "$(cmake-utils_use upnp USE_MINIUPNP)" - ) - cmake-utils_src_configure -} diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.8.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.8.ebuild deleted file mode 100644 index b490f2441583..000000000000 --- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.8.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.8.ebuild,v 1.3 2013/09/04 18:53:49 pinkbyte Exp $ - -EAPI="5" - -LANGS="be bg cs de el en es fr hu it pl pt_BR ru sk uk" # drop sr@latin for bug #429786 - -[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS="" -inherit cmake-utils ${VCS_ECLASS} - -DESCRIPTION="Qt4 based client for DirectConnect and ADC protocols, based on DC++ library" -HOMEPAGE="http://eiskaltdc.googlecode.com/" - -LICENSE="GPL-2 GPL-3" -SLOT="0" -IUSE="cli daemon dbus +dht +emoticons examples -gtk idn -javascript json libcanberra libnotify lua +minimal pcre +qt4 sound spell sqlite upnp -xmlrpc" -for x in ${LANGS}; do - IUSE="${IUSE} linguas_${x}" -done - -REQUIRED_USE=" - cli? ( ^^ ( json xmlrpc ) ) - emoticons? ( || ( gtk qt4 ) ) - dbus? ( qt4 ) - javascript? ( qt4 ) - json? ( !xmlrpc ) - libcanberra? ( gtk ) - libnotify? ( gtk ) - spell? ( qt4 ) - sound? ( || ( gtk qt4 ) ) - sqlite? ( qt4 ) -" - -if [[ ${PV} != *9999* ]]; then - SRC_URI="http://${PN/pp/}.googlecode.com/files/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -else - EGIT_REPO_URI="git://github.com/${PN}/${PN}.git" - KEYWORDS="" -fi - -RDEPEND=" - app-arch/bzip2 - >=dev-libs/boost-1.38 - >=dev-libs/openssl-0.9.8 - sys-apps/attr - sys-devel/gettext - sys-libs/zlib - virtual/libiconv - idn? ( net-dns/libidn ) - lua? ( >=dev-lang/lua-5.1 ) - pcre? ( >=dev-libs/libpcre-4.2 ) - upnp? ( >=net-libs/miniupnpc-1.6 ) - cli? ( - >=dev-lang/perl-5.10 - perl-core/Getopt-Long - dev-perl/Data-Dump - dev-perl/Term-ShellUI - json? ( dev-perl/JSON-RPC ) - xmlrpc? ( dev-perl/RPC-XML ) - ) - daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) ) - gtk? ( - x11-libs/pango - x11-libs/gtk+:3 - >=dev-libs/glib-2.24:2 - x11-themes/hicolor-icon-theme - libcanberra? ( media-libs/libcanberra ) - libnotify? ( >=x11-libs/libnotify-0.4.1 ) - ) - qt4? ( - >=dev-qt/qtgui-4.6.0:4 - dbus? ( >=dev-qt/qtdbus-4.6.0:4 ) - javascript? ( - dev-qt/qtscript:4 - x11-libs/qtscriptgenerator - ) - spell? ( app-text/aspell ) - sqlite? ( dev-qt/qtsql:4[sqlite] ) - ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" -DOCS="AUTHORS ChangeLog.txt" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \ - && die "Sorry, but gcc-4.4 and earlier won't work." - fi -} - -src_configure() { - # linguas - local langs x - for x in ${LANGS}; do - use linguas_${x} && langs+=" ${x}" - done - - local mycmakeargs=( - -DLIB_INSTALL_DIR="$(get_libdir)" - -Dlinguas="${langs}" - -DLOCAL_MINIUPNP=OFF - -DUSE_GTK=OFF - -DUSE_LIBGNOME2=OFF - "$(use cli && cmake-utils_use json USE_CLI_JSONRPC)" - "$(use cli && cmake-utils_use xmlrpc USE_CLI_XMLRPC)" - "$(cmake-utils_use daemon NO_UI_DAEMON)" - "$(use daemon && cmake-utils_use json JSONRPC_DAEMON)" - "$(use daemon && cmake-utils_use xmlrpc XMLRPC_DAEMON)" - "$(cmake-utils_use dbus DBUS_NOTIFY)" - "$(cmake-utils_use dht WITH_DHT)" - "$(cmake-utils_use emoticons WITH_EMOTICONS)" - "$(cmake-utils_use examples WITH_EXAMPLES)" - "$(cmake-utils_use gtk USE_GTK3)" - "$(cmake-utils_use idn USE_IDNA)" - "$(cmake-utils_use javascript USE_JS)" - "$(cmake-utils_use libcanberra LIBCANBERRA)" - "$(cmake-utils_use libnotify USE_LIBNOTIFY)" - "$(cmake-utils_use lua LUA_SCRIPT)" - "$(cmake-utils_use lua WITH_LUASCRIPTS)" - "$(cmake-utils_use !minimal WITH_DEV_FILES)" - "$(cmake-utils_use pcre PERL_REGEX)" - "$(cmake-utils_use qt4 USE_QT)" - "$(cmake-utils_use sound WITH_SOUNDS)" - "$(cmake-utils_use spell USE_ASPELL)" - "$(cmake-utils_use sqlite USE_QT_SQLITE)" - "$(cmake-utils_use upnp USE_MINIUPNP)" - ) - cmake-utils_src_configure -} diff --git a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.7-boost-1.50.patch b/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.7-boost-1.50.patch deleted file mode 100644 index 845931d834d1..000000000000 --- a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.7-boost-1.50.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ea7723f851b0570994f3f047c37639a8b343e616 Mon Sep 17 00:00:00 2001 -From: Boris Pek <tehnick-8@yandex.ru> -Date: Fri, 7 Dec 2012 19:54:47 +0200 -Subject: [PATCH] Fix build with Boost >= 1.50. - ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 928323b..161bb94 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -170,6 +170,9 @@ else (LOCAL_BOOST) - if (Boost_VERSION VERSION_LESS 104200) - add_definitions(-DTIMER_OLD_BOOST) - endif() -+ if (Boost_VERSION VERSION_GREATER 105000) -+ find_package(Boost COMPONENTS system REQUIRED) -+ endif() - endif(LOCAL_BOOST) - - if (LIB_INSTALL_DIR) --- -1.8.1.5 - diff --git a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.8-sr-latin.patch b/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.8-sr-latin.patch deleted file mode 100644 index bdf6505dd384..000000000000 --- a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.8-sr-latin.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d266f4361928778f79f8e5fbf01c5dc46dbfccd4 Mon Sep 17 00:00:00 2001 -From: Eugene Petrov <dhamp@ya.ru> -Date: Mon, 24 Jun 2013 14:49:37 +0400 -Subject: [PATCH] Cmake: fix build sr@latin translation - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 581090b..d8bd6a7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -319,7 +319,7 @@ else (NOT DEFINED linguas) - elseif (linguas STREQUAL *) - set (LANGUAGES ${AllLanguages} CACHE STRING "Using translations" FORCE) - else (NOT linguas) -- string(REGEX MATCHALL [a-zA-Z_]+ -+ string(REGEX MATCHALL [a-zA-Z_@]+ - linguas1 ${linguas}) - set (LANGUAGES ${linguas1} CACHE STRING "Using translations" FORCE) - endif (NOT linguas) --- -1.8.1.6 - |