From b745759bf295b5bfdfa18c831dae026d23f2f792 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Thu, 29 Mar 2012 08:11:51 +0000 Subject: Version bump, bug #410051, thank Nikoli for this job. (Portage version: 2.1.10.44/cvs/Linux x86_64) --- net-p2p/eiskaltdcpp/ChangeLog | 8 +- net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.6.ebuild | 137 +++++++++++++++++++++++++++ net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild | 39 +++++--- net-p2p/eiskaltdcpp/metadata.xml | 8 +- 4 files changed, 176 insertions(+), 16 deletions(-) create mode 100644 net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.6.ebuild diff --git a/net-p2p/eiskaltdcpp/ChangeLog b/net-p2p/eiskaltdcpp/ChangeLog index 8efb6d0b3d36..b58a59262a50 100644 --- a/net-p2p/eiskaltdcpp/ChangeLog +++ b/net-p2p/eiskaltdcpp/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-p2p/eiskaltdcpp # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.35 2012/02/20 04:28:01 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.36 2012/03/29 08:11:51 pva Exp $ + +*eiskaltdcpp-2.2.6 (29 Mar 2012) + + 29 Mar 2012; Peter Volkov +eiskaltdcpp-2.2.6.ebuild, + eiskaltdcpp-9999.ebuild, metadata.xml: + Version bump, bug #410051, thank Nikoli for this job. 20 Feb 2012; Mike Gilbert metadata.xml: Drop no-herd. diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.6.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.6.ebuild new file mode 100644 index 000000000000..23465c00b855 --- /dev/null +++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.6.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.6.ebuild,v 1.1 2012/03/29 08:11:51 pva Exp $ + +EAPI="4" + +LANGS="be bg cs de el en es fr hu it pl 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 -gnome -gtk -gtk3 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 ) + gnome? ( gtk ) + gtk3? ( gtk ) + javascript? ( qt4 ) + json? ( !xmlrpc ) + libcanberra? ( !gnome 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/negativ/${PN}.git" + KEYWORDS="" +fi + +RDEPEND=" + app-arch/bzip2 + >=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 dev-perl/Data-Dump ) + xmlrpc? ( dev-perl/RPC-XML ) + ) + daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) ) + gtk? ( + x11-libs/pango + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( >=x11-libs/gtk+-2.24:2 ) + >=dev-libs/glib-2.24:2 + x11-themes/hicolor-icon-theme + gnome? ( gnome-base/libgnome ) + libcanberra? ( media-libs/libcanberra ) + libnotify? ( >=x11-libs/libnotify-0.4.1 ) + ) + qt4? ( + >=x11-libs/qt-gui-4.4.0:4[dbus?] + javascript? ( + x11-libs/qt-script + x11-libs/qtscriptgenerator + ) + spell? ( app-text/aspell ) + sqlite? ( x11-libs/qt-sql:4[sqlite] ) + ) +" +DEPEND="${RDEPEND} + >=dev-libs/boost-1.34.1 + dev-util/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 + "$(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 gnome USE_LIBGNOME2)" + "$(cmake-utils_use gtk USE_GTK)" + "$(cmake-utils_use gtk3 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-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild index 388e08c3f32a..3f0f7f130b4a 100644 --- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild +++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.26 2011/10/19 19:50:45 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.27 2012/03/29 08:11:51 pva Exp $ EAPI="4" -LANGS="be bg cs de en es fr hu pl ru sk sr uk" +LANGS="be bg cs de el en es fr hu it pl ru sk sr@latin uk" [[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS="" inherit cmake-utils ${VCS_ECLASS} @@ -14,21 +14,24 @@ HOMEPAGE="http://eiskaltdc.googlecode.com/" LICENSE="GPL-2 GPL-3" SLOT="0" -IUSE="cli daemon dbus +dht +emoticons examples -gnome -gtk idn -javascript libnotify lua +minimal pcre +qt4 sound spell sqlite upnp xmlrpc" +IUSE="cli daemon dbus +dht +emoticons examples -gnome -gtk -gtk3 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 ) gnome? ( gtk ) + gtk3? ( gtk ) javascript? ( qt4 ) + json? ( !xmlrpc ) + libcanberra? ( !gnome gtk ) libnotify? ( gtk ) spell? ( qt4 ) sound? ( || ( gtk qt4 ) ) sqlite? ( qt4 ) - xmlrpc? ( daemon ) " if [[ ${PV} != *9999* ]]; then @@ -42,25 +45,31 @@ fi RDEPEND=" app-arch/bzip2 >=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 ) + upnp? ( >=net-libs/miniupnpc-1.6 ) cli? ( >=dev-lang/perl-5.10 - dev-perl/RPC-XML + perl-core/Getopt-Long + dev-perl/Data-Dump dev-perl/Term-ShellUI + json? ( dev-perl/JSON-RPC dev-perl/Data-Dump ) + xmlrpc? ( dev-perl/RPC-XML ) ) daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) ) gtk? ( x11-libs/pango - >=x11-libs/gtk+-2.18:2 - >=dev-libs/glib-2.18:2 + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( >=x11-libs/gtk+-2.24:2 ) + >=dev-libs/glib-2.24:2 x11-themes/hicolor-icon-theme gnome? ( gnome-base/libgnome ) + libcanberra? ( media-libs/libcanberra ) libnotify? ( >=x11-libs/libnotify-0.4.1 ) ) qt4? ( @@ -82,8 +91,8 @@ 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 3 ]] ) \ - && die "Sorry, but gcc-4.3 and earlier won't work." + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \ + && die "Sorry, but gcc-4.4 and earlier won't work." fi } @@ -98,16 +107,21 @@ src_configure() { -DLIB_INSTALL_DIR="$(get_libdir)" -Dlinguas="${langs}" -DLOCAL_MINIUPNP=OFF - "$(cmake-utils_use cli USE_CLI)" + "$(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 gnome USE_LIBGNOME2)" "$(cmake-utils_use gtk USE_GTK)" + "$(cmake-utils_use gtk3 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)" @@ -118,7 +132,6 @@ src_configure() { "$(cmake-utils_use spell USE_ASPELL)" "$(cmake-utils_use sqlite USE_QT_SQLITE)" "$(cmake-utils_use upnp USE_MINIUPNP)" - "$(cmake-utils_use xmlrpc XMLRPC_DAEMON)" ) cmake-utils_src_configure } diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml index 968969efde99..e6a69e14bb9c 100644 --- a/net-p2p/eiskaltdcpp/metadata.xml +++ b/net-p2p/eiskaltdcpp/metadata.xml @@ -16,10 +16,14 @@ common DC hub software. - Enable eiskaltdcpp-daemon with sample cli based on readline - Enable eiskaltdcpp-daemon without any UI + Enable sample cli based on readline + Enable eiskaltdcpp-daemon Enable DHT (distributed hash table) support for libeiskaltdcpp Install emoticon packs + Enable sound notifications support over libgnome2 in EiskaltDC++ Gtk + Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2 + Enable JSON for cli and daemon + Enable sound notifications support over libcanberra in EiskaltDC++ Gtk Don't install headers Forward ports using UPnP -- cgit v1.2.3-65-gdbad