diff options
| -rw-r--r-- | net-p2p/eiskaltdcpp/ChangeLog | 8 | ||||
| -rw-r--r-- | net-p2p/eiskaltdcpp/Manifest | 14 | ||||
| -rw-r--r-- | net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.6.ebuild | 137 | ||||
| -rw-r--r-- | net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild | 39 | ||||
| -rw-r--r-- | net-p2p/eiskaltdcpp/metadata.xml | 8 |
5 files changed, 184 insertions, 22 deletions
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 <pva@gentoo.org> +eiskaltdcpp-2.2.6.ebuild, + eiskaltdcpp-9999.ebuild, metadata.xml: + Version bump, bug #410051, thank Nikoli for this job. 20 Feb 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml: Drop no-herd. diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest index d7521447beba..52567c78ffab 100644 --- a/net-p2p/eiskaltdcpp/Manifest +++ b/net-p2p/eiskaltdcpp/Manifest @@ -5,17 +5,19 @@ DIST eiskaltdcpp-2.2.1.tar.xz 1916680 RMD160 e0c10b3eb7482e460f26a03396a03cad3d9 DIST eiskaltdcpp-2.2.2.tar.xz 1928244 RMD160 06935cd72942ba2bdea7a332418020aa98097727 SHA1 183641ef6dda313ae0047e35b2aa69e0bcedaf0e SHA256 9289b23daa3c2683f9b10601233be422e4fcab33b307ad573a7fcaa5dd2194b5 DIST eiskaltdcpp-2.2.3.tar.xz 2004692 RMD160 230da8beb1fb20d3d1a1c8421572195c4a9f21ab SHA1 29e31d6fe732a444d8710cf8badc0ed9de4ffa88 SHA256 190c0b8ac895b54ab7bdd455cd2b3ef4bf95471d5480441ffaef426959b27064 DIST eiskaltdcpp-2.2.4.tar.xz 2008920 RMD160 7e27c1bd8b749283d2d887b3b3670c267c7aba05 SHA1 fe9908046981e4eedf036751b9582030eca5618a SHA256 a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4 +DIST eiskaltdcpp-2.2.6.tar.xz 2139244 RMD160 85a835496d1361e8af9b6b642fa16aea977fd1ee SHA1 696a3a26b551848a336a58c7bb241b8d234851fd SHA256 378645840cb11297a311e915db930fba9e0273e38d99fba488dbef7743400ad8 EBUILD eiskaltdcpp-2.2.1.ebuild 2567 RMD160 164067e24486b9b7f7e582888bf7c724c108596a SHA1 6bce31e3d71a640110ab19bc68fed6eed108fd99 SHA256 cf89258d8f85aeed3eaad1517222d0551b636a14067f2142c4fe7d2a5d9b8532 EBUILD eiskaltdcpp-2.2.2.ebuild 2900 RMD160 a03f80e192ed92a13a8547b980dad2439f34dc2e SHA1 9e75b1829ed521e08b56396fca39f6a526673068 SHA256 5a0301da85d190883306755db2ef28600b9c3c93359d1f4e9a78fdb1205091fc EBUILD eiskaltdcpp-2.2.3.ebuild 2833 RMD160 cfb4e634c6b87f96d0374ac1c5b364c3f754572f SHA1 60cf1a3b1699f6b6111f416708f0710f0d83a276 SHA256 143bd2dbbf2b9523a292ccde5efe78bd6dfd976af05d9a2684c70a69ad7b11e6 EBUILD eiskaltdcpp-2.2.4.ebuild 3303 RMD160 d74333764ba7bf69efd9974061de3cf6148db7be SHA1 2635e6d3c5b4d2e2032095c3317e2b09a4bfb58b SHA256 fb2a563333a8820456700df43b9fa5ea854411ac32a94ee5e017b1e6ae96e1ed -EBUILD eiskaltdcpp-9999.ebuild 3303 RMD160 dc7c83838597094fb545698c52b18564f786e975 SHA1 0537663cc25fe007007c1b50b5569a4859df3b62 SHA256 a25d0da5470a2f4b36a278da662ed41eacbd17d6e97bffd39a21f76add065f84 -MISC ChangeLog 6099 RMD160 161b727430565dc1f70d7638f9323fcf349206ff SHA1 9cf02197fcff4084484852e04f45316ffa80284c SHA256 9a4fffceea9075ef848b24318c4d6d5ad26c6764f574e06be3212e17d21a878f -MISC metadata.xml 1036 RMD160 08dd42967be9e3a19e4088754c674cf0ae0c5fbd SHA1 a80c2320cec26d334a71947a190ffd41d9cade83 SHA256 5baeff68b16ee63fdc6699ab1a615f63bac34001af388d8878c0953f99aedc4a +EBUILD eiskaltdcpp-2.2.6.ebuild 3850 RMD160 f479a09beda95cd8e0a32e16598e318f8cae35f1 SHA1 d89b3fd01e84a54c8f0ff9f9db34bda0c8d8cffa SHA256 e543ba1312d886e9e046eca6dc07c161a2a241be32a87e09fd7ac6bc5324edb9 +EBUILD eiskaltdcpp-9999.ebuild 3850 RMD160 33a1d60a6258dfc515043cd0d6a007033eafcaf0 SHA1 b6416408cc71fbda16e2ec6a47bffa48036ae565 SHA256 d2ac50bd8492b98278fe5869d315e7e2624213d4e33276c2354176297cab520b +MISC ChangeLog 6299 RMD160 d44100a6bf88b67c93b751c0b0c8c2737cd6a4d2 SHA1 9b7d137c0a5480d847ef5f8212a4e85aeee3c771 SHA256 f8be1f7c378f34baa53dfecbb6eaddd7fdcd183e8764c849116859b23dc8ac12 +MISC metadata.xml 1331 RMD160 18fbd077ae6b48f2bee2b3404385bfb52767e4da SHA1 ed485727b74a9624a0899add6d676100e760c74e SHA256 123093a2b8c19790a04ea9615b3877c65303638ddfbeccc40b13aa7a78d43ca3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk9By9cACgkQC77qH+pIQ6S3lAD+PdE/iU2HNku/C3gaZpZg5zyA -CjvuR9ctl/HeV/68eW4A/1aybBwGYkjOK5kF+kBTyKjvcYOJmMqOA0EUommxPAES -=VDH2 +iF4EAREIAAYFAk90GPQACgkQGrk+8vGYmwcTTQD/Za9Zst2P+P326jG7p4okwvBI +3Rur78sr0+8WtPWkvBsA/idQKNQw81g96mC5H/CzMZQhb7fu6+ToZwbHP65bRwJP +=l4Me -----END PGP SIGNATURE----- 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. </longdescription> <use> - <flag name="cli">Enable eiskaltdcpp-daemon with sample cli based on readline</flag> - <flag name="daemon">Enable eiskaltdcpp-daemon without any UI</flag> + <flag name="cli">Enable sample cli based on readline</flag> + <flag name="daemon">Enable eiskaltdcpp-daemon</flag> <flag name="dht">Enable DHT (distributed hash table) support for libeiskaltdcpp</flag> <flag name="emoticons">Install emoticon packs</flag> + <flag name="gnome">Enable sound notifications support over libgnome2 in EiskaltDC++ Gtk</flag> + <flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag> + <flag name="json">Enable JSON for cli and daemon</flag> + <flag name="libcanberra">Enable sound notifications support over libcanberra in EiskaltDC++ Gtk</flag> <flag name="minimal">Don't install headers</flag> <flag name="upnp">Forward ports using UPnP</flag> </use> |