commit:     8149e9b8f5cb0d67e0e74a259694cf96b90c20dc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 11:52:15 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 11:57:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8149e9b8

net-p2p/eiskaltdcpp: Cleanup old and Qt4-based

metadata.xml indentation.

Gentoo-bug: 631788
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-p2p/eiskaltdcpp/Manifest                 |   1 -
 net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild | 146 ---------------------------
 net-p2p/eiskaltdcpp/metadata.xml             |  37 ++++---
 3 files changed, 18 insertions(+), 166 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index 93b7ee2adde..38ddc729845 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1,2 +1 @@
 DIST eiskaltdcpp-2.2.10.tar.gz 3843143 SHA256 
e461c8c499e459651d6382a6ded6788e5ac9a9c4ff26386c3cf073d94d606127 SHA512 
97c39287b9568aebc5ab21aeabefb63ea32bde8744242bb8647b742c933de9cf74a7fbb2e6df7be6046319bbc660e8abdec0fa332ee91ec5048492af0d763818
 WHIRLPOOL 
463abac15ccabdbe002d6b5e30cf1baa7486055e304ec963a4d50449ff8b451d093beba273d2e11a9002e642d6dcb06e05970898b893a86c7917dfbfa02611ae
-DIST eiskaltdcpp-2.2.9.tar.gz 3578993 SHA256 
99f1f66038ec19ec14992df484f97b88238df5dd260ca72d5023fb9a6fef44b4 SHA512 
8b3a58e1fe757b5cef50b3ec534f135b2285d843f0120758f07bd3a1ce82aaf0874d78a04ba1d2eb4f584db50a2bc3315536ebdbabbb4d296b42e8ca90cc630b
 WHIRLPOOL 
0bb140c903556fd82d1e888b2dd581c362375983ad585ea0686e5cb8bebcf257d8356d546af3779103b9173c1f3a1061df383da8932a835eb7c5a1bb0e932c55

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild 
b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild
deleted file mode 100644
index 1a40bf8d5bc..00000000000
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PLOCALES="be bg cs de el en es fr hu it pl pt_BR ru sk sr@latin uk"
-
-inherit cmake-utils eutils l10n fdo-mime gnome2-utils
-[[ ${PV} = *9999* ]] && inherit git-r3
-
-DESCRIPTION="Qt based client for DirectConnect and ADC protocols, based on 
DC++ library"
-HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp";
-
-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"
-
-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="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-       KEYWORDS="amd64 x86"
-else
-       EGIT_REPO_URI="https://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-libs/zlib
-       virtual/libiconv
-       virtual/libintl
-       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
-               virtual/perl-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/qtcore-4.6.0:4
-               >=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}
-       sys-devel/gettext
-       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_prepare() {
-       l10n_find_plocales_changes 'eiskaltdcpp-qt/translations' '' '.ts'
-
-       epatch_user
-}
-
-src_configure() {
-       local mycmakeargs=(
-               -DLIB_INSTALL_DIR="$(get_libdir)"
-               -Dlinguas="$(l10n_get_locales)"
-               -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
-}
-
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
-pkg_postinst() {
-       fdo-mime_desktop_database_update
-       gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-       fdo-mime_desktop_database_update
-       gnome2_icon_cache_update
-}

diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
index 6661b81a3c9..b65eafebb42 100644
--- a/net-p2p/eiskaltdcpp/metadata.xml
+++ b/net-p2p/eiskaltdcpp/metadata.xml
@@ -1,23 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
-  EiskaltDC++ is a multi-platform program that uses the Direct Connect and
-  ADC protocol. It is compatible with other DC clients, such as the original DC
-  from Neomodus, DC++ and derivatives. EiskaltDC++ also interoperates with all
-  common DC hub software.
-  </longdescription>
-  <use>
-    <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="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>
-  </use>
-  <upstream>
-    <remote-id type="github">eiskaltdcpp/eiskaltdcpp</remote-id>
-  </upstream>
+       <!-- maintainer-needed -->
+       <longdescription lang="en">
+       EiskaltDC++ is a multi-platform program that uses the Direct Connect and
+       ADC protocol. It is compatible with other DC clients, such as the 
original DC
+       from Neomodus, DC++ and derivatives. EiskaltDC++ also interoperates 
with all
+       common DC hub software.
+       </longdescription>
+       <use>
+               <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="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>
+       </use>
+       <upstream>
+               <remote-id type="github">eiskaltdcpp/eiskaltdcpp</remote-id>
+       </upstream>
 </pkgmetadata>

Reply via email to