diff options
author | Peter Volkov <pva@gentoo.org> | 2011-10-08 15:49:45 +0000 |
---|---|---|
committer | Peter Volkov <pva@gentoo.org> | 2011-10-08 15:49:45 +0000 |
commit | 936dc4d14c38414f97967f738d137bcb49d3a821 (patch) | |
tree | 9e6235e894be38d3de39d989ca1528822b53a97e /net-p2p/eiskaltdcpp | |
parent | Do not use /lib64 for rules. (diff) | |
download | historical-936dc4d14c38414f97967f738d137bcb49d3a821.tar.gz historical-936dc4d14c38414f97967f738d137bcb49d3a821.tar.bz2 historical-936dc4d14c38414f97967f738d137bcb49d3a821.zip |
Version bump, update VCS ebuild, thank Nikoli for this job.
Package-Manager: portage-2.1.10.20/cvs/Linux x86_64
Diffstat (limited to 'net-p2p/eiskaltdcpp')
-rw-r--r-- | net-p2p/eiskaltdcpp/ChangeLog | 8 | ||||
-rw-r--r-- | net-p2p/eiskaltdcpp/Manifest | 18 | ||||
-rw-r--r-- | net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild | 119 | ||||
-rw-r--r-- | net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild | 26 | ||||
-rw-r--r-- | net-p2p/eiskaltdcpp/metadata.xml | 2 |
5 files changed, 155 insertions, 18 deletions
diff --git a/net-p2p/eiskaltdcpp/ChangeLog b/net-p2p/eiskaltdcpp/ChangeLog index c63d22ad87ae..50ad2b213e19 100644 --- a/net-p2p/eiskaltdcpp/ChangeLog +++ b/net-p2p/eiskaltdcpp/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-p2p/eiskaltdcpp # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.31 2011/09/21 08:24:00 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.32 2011/10/08 15:49:45 pva Exp $ + +*eiskaltdcpp-2.2.4 (08 Oct 2011) + + 08 Oct 2011; Peter Volkov <pva@gentoo.org> +eiskaltdcpp-2.2.4.ebuild, + eiskaltdcpp-9999.ebuild, metadata.xml: + Version bump, update VCS ebuild, thank Nikoli for this job. 21 Sep 2011; Michał Górny <mgorny@gentoo.org> eiskaltdcpp-9999.ebuild: Migrate to git-2. diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest index efe04d422e3b..db202a2631fd 100644 --- a/net-p2p/eiskaltdcpp/Manifest +++ b/net-p2p/eiskaltdcpp/Manifest @@ -4,18 +4,18 @@ Hash: SHA256 DIST eiskaltdcpp-2.2.1.tar.xz 1916680 RMD160 e0c10b3eb7482e460f26a03396a03cad3d9f0fbf SHA1 bdb0beb9ef8f4448bb88e22028a72e6b44159898 SHA256 2b2bd627a1325c595f604766404ca4f4787db1b49b4b0c5c5d8e88ddfc2a2c40 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 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-9999.ebuild 2877 RMD160 ba6f7118ba626dd8e13849c57f2c06e6491354c0 SHA1 fe003b2f71eaefd8d5dd6d7381f18b8e5dff6ca2 SHA256 e8a582c819037190cb2e86a8f179ad33c584e8376f3f11d1c4d577d0053c26b9 -MISC ChangeLog 5488 RMD160 fa1794c4206cac7807b9c58bc07dcbae9230e9a9 SHA1 b4ea6c742ed544bdf841eff7c74ce2e067b9cec0 SHA256 2e54ee2f1bd66c9196bec8f5b8995082d8e24d63b52924ed455d12d6b9336292 -MISC metadata.xml 947 RMD160 8805dbd95d3d0a7b77b36d5decfd38a9d217b491 SHA1 336cb82f02941be38f20ebde7521eab6be0cea3e SHA256 e67cff290c952d9bd9027cabdb67bb3a615ac21cf10341cd833ac570b563a169 +EBUILD eiskaltdcpp-2.2.4.ebuild 3203 RMD160 3014150e44178d604a9f7ab02ed34c80a9dba636 SHA1 13cf7dfe028ced4fe04de3db48469fc3902a506b SHA256 24387b5a82e305cec1e65000cbe53ff524bb120976c41ba021eaca031bffecdb +EBUILD eiskaltdcpp-9999.ebuild 3203 RMD160 dcecf454457fb2a7822a11214446414a774d4110 SHA1 432a3087494759f246e4d3318c3cbcf4c2c698bf SHA256 a29a737bf617a19bfbef6288a54986d6ebadc50431382f220bc73fd72662bcd6 +MISC ChangeLog 5695 RMD160 0d8500fe7de55a6a25c0774ba755c2b7f4f04ae7 SHA1 655d0206e867e94aa9f048279fc74c1cbdc829c1 SHA256 ae9ca5a0b6593cc7ce32caba46ccee419acb74a4a923576a18fe0f58c67ede2a +MISC metadata.xml 1057 RMD160 6b3d98e5b1d35fd231ccbdf7f006f2840053fca5 SHA1 8c43cea56c16a5871617c4f62c8b87884a3e5c8a SHA256 f148a2ba2035325cb6ffe349d6b066e87a22a106620795919dafa83554634055 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iJwEAQEIAAYFAk59rgwACgkQfXuS5UK5QB0T6AQAgob8UbQbYCMw0d+iD+mEfUn1 -ktm6PXLyuAqKsgvDtkweKP+5egMGWO0vISxpdrPl79P4N2ltjxl0ftk2sjQomMuq -cIET13R0dMHPY1hdEQV0ORqODd6+Ug0+lJ9tLE000xzJB/Xw8Q2MvZApPFtih4U9 -bo9cpkSOBE9HtvLSEKA= -=F3R0 +iF4EAREIAAYFAk6QcMUACgkQGrk+8vGYmwezywD+PvaSXMcesETk5IjURREYK0CO +2FYMiVhU8jMyMqTS8y8A/3IW2fXmB+WlGPrTLehDiRHgwDBr8GpqtBjkBTCSqlED +=dHqo -----END PGP SIGNATURE----- diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild new file mode 100644 index 000000000000..c8f9b789fc9d --- /dev/null +++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild,v 1.1 2011/10/08 15:49:45 pva Exp $ + +EAPI="4" + +LANGS="be bg cs de en es fr hu pl ru sk sr 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="daemon dbus +dht +emoticons examples -gnome -gtk idn -javascript libnotify lua +minimal pcre +qt4 sound spell sqlite upnp xmlrpc" +for x in ${LANGS}; do + IUSE="${IUSE} linguas_${x}" +done + +REQUIRED_USE=" + emoticons? ( || ( gtk qt4 ) ) + dbus? ( qt4 ) + gnome? ( gtk ) + javascript? ( qt4 ) + libnotify? ( gtk ) + spell? ( qt4 ) + sound? ( || ( gtk qt4 ) ) + sqlite? ( qt4 ) + xmlrpc? ( daemon ) +" + +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-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 ) + daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) ) + gtk? ( + x11-libs/pango + >=x11-libs/gtk+-2.24:2 + >=dev-libs/glib-2.18:2 + x11-themes/hicolor-icon-theme + gnome? ( gnome-base/libgnome ) + 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 3 ]] ) \ + && die "Sorry, but gcc-4.3 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 + "$(cmake-utils_use daemon NO_UI_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 idn USE_IDNA)" + "$(cmake-utils_use javascript USE_JS)" + "$(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_use xmlrpc XMLRPC_DAEMON)" + -DUSE_CLI=OFF + ) + cmake-utils_src_configure +} diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild index 74a1d7e991aa..f6ee6a460c6f 100644 --- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild +++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.23 2011/09/21 08:24:00 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.24 2011/10/08 15:49:45 pva Exp $ EAPI="4" @@ -14,7 +14,7 @@ HOMEPAGE="http://eiskaltdc.googlecode.com/" LICENSE="GPL-2 GPL-3" SLOT="0" -IUSE="daemon dbus +emoticons examples -gnome -gtk idn -javascript libnotify lua +minimal pcre +qt4 sound spell sqlite upnp" +IUSE="daemon dbus +dht +emoticons examples -gnome -gtk idn -javascript libnotify lua +minimal pcre +qt4 sound spell sqlite upnp xmlrpc" for x in ${LANGS}; do IUSE="${IUSE} linguas_${x}" done @@ -28,14 +28,14 @@ REQUIRED_USE=" spell? ( qt4 ) sound? ( || ( gtk qt4 ) ) sqlite? ( qt4 ) + xmlrpc? ( daemon ) " 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 - https://github.com/negativ/${PN}.git" + EGIT_REPO_URI="git://github.com/negativ/${PN}.git" KEYWORDS="" fi @@ -49,11 +49,11 @@ RDEPEND=" lua? ( >=dev-lang/lua-5.1 ) pcre? ( >=dev-libs/libpcre-4.2 ) upnp? ( net-libs/miniupnpc ) + daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) ) gtk? ( x11-libs/pango - >=x11-libs/gtk+-2.10:2 - >=dev-libs/glib-2.10:2 - >=gnome-base/libglade-2.4:2.0 + >=x11-libs/gtk+-2.18:2 + >=dev-libs/glib-2.18:2 x11-themes/hicolor-icon-theme gnome? ( gnome-base/libgnome ) libnotify? ( >=x11-libs/libnotify-0.4.1 ) @@ -74,6 +74,14 @@ DEPEND="${RDEPEND} " 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." + fi +} + src_configure() { # linguas local langs x @@ -87,6 +95,7 @@ src_configure() { -DLOCAL_MINIUPNP=OFF "$(cmake-utils_use daemon NO_UI_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)" @@ -103,7 +112,8 @@ src_configure() { "$(cmake-utils_use spell USE_ASPELL)" "$(cmake-utils_use sqlite USE_QT_SQLITE)" "$(cmake-utils_use upnp USE_MINIUPNP)" - -DXMLRPC_DAEMON=OFF + "$(cmake-utils_use xmlrpc XMLRPC_DAEMON)" + -DUSE_CLI=OFF ) cmake-utils_src_configure } diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml index 0b0dc562ae0e..3acc456d281c 100644 --- a/net-p2p/eiskaltdcpp/metadata.xml +++ b/net-p2p/eiskaltdcpp/metadata.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> +<herd>no-herd</herd> <maintainer> <email>pva@gentoo.org</email> <name>Peter Volkov</name> @@ -18,6 +19,7 @@ <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="dht">Enable DHT (distributed hash table) support for libeiskaltdcpp</flag> <flag name="emoticons">Install emoticon packs</flag> <flag name="minimal">Don't install headers</flag> <flag name="upnp">Forward ports using UPnP</flag> |