Update mime database and icon cache, add missing dependency on dev-qt/qtcore, use l10n.eclass, bug #508162. Thanks to Nikoli.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)

3 files changed, 66 insertions, 37 deletions

diff --git a/net-p2p/eiskaltdcpp/ChangeLog b/net-p2p/eiskaltdcpp/ChangeLog
index f25e5b260502..4756fc75ea98 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.62 2014/01/30 11:11:38 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.63 2014/04/26 19:19:07 maksbotan Exp $
+
+  26 Apr 2014; Maxim Koltsov <maksbotan@gentoo.org> eiskaltdcpp-2.2.9.ebuild,
+  eiskaltdcpp-9999.ebuild:
+  Update mime database and icon cache, add missing dependency on dev-qt/qtcore,
+  use l10n.eclass, bug #508162. Thanks to Nikoli.
 
   30 Jan 2014; Sergey Popov <pinkbyte@gentoo.org> eiskaltdcpp-2.2.9.ebuild,
   eiskaltdcpp-9999.ebuild:
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild
index 9bf3acbbc9ad..4e595bfe1914 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild
@@ -1,23 +1,20 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild,v 1.4 2014/01/30 11:11:38 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild,v 1.5 2014/04/26 19:19:07 maksbotan Exp $
 
 EAPI="5"
 
-LANGS="be bg cs de el en es fr hu it pl pt_BR ru sk sr@latin uk"
+PLOCALES="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}
+inherit cmake-utils eutils l10n fdo-mime gnome2-utils
+[[ ${PV} = *9999* ]] && inherit git-r3
 
-DESCRIPTION="Qt4 based client for DirectConnect and ADC protocols, based on DC++ library"
-HOMEPAGE="http://eiskaltdc.googlecode.com/"
+DESCRIPTION="Qt based client for DirectConnect and ADC protocols, based on DC++ library"
+HOMEPAGE="https://code.google.com/p/eiskaltdc/"
 
 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 ) )
@@ -33,10 +30,10 @@ REQUIRED_USE="
 "
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://${PN/pp/}.googlecode.com/files/${P}.tar.xz"
+	SRC_URI="https://eiskaltdc.googlecode.com/files/${P}.tar.xz"
 	KEYWORDS="amd64 x86"
 else
-	EGIT_REPO_URI="git://github.com/${PN}/${PN}.git"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	KEYWORDS=""
 fi
 
@@ -70,6 +67,7 @@ RDEPEND="
 		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? (
@@ -94,16 +92,16 @@ pkg_pretend() {
 	fi
 }
 
-src_configure() {
-	# linguas
-	local langs x
-	for x in ${LANGS}; do
-		use linguas_${x} && langs+=" ${x}"
-	done
+src_prepare() {
+	l10n_find_plocales_changes 'eiskaltdcpp-qt/translations' '' '.ts'
+
+	epatch_user
+}
 
+src_configure() {
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-Dlinguas="${langs}"
+		-Dlinguas="$(l10n_get_locales)"
 		-DLOCAL_MINIUPNP=OFF
 		-DUSE_GTK=OFF
 		-DUSE_LIBGNOME2=OFF
@@ -133,3 +131,17 @@ src_configure() {
 	)
 	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/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index d8593363ea11..8bb59a69baf6 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -1,23 +1,20 @@
 # Copyright 1999-2014 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.38 2014/01/30 11:11:38 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.39 2014/04/26 19:19:07 maksbotan Exp $
 
 EAPI="5"
 
-LANGS="be bg cs de el en es fr hu it pl pt_BR ru sk sr@latin uk"
+PLOCALES="be bg cs de el en es fr hu it pl pt_BR ru sk sr@latin sv_SE uk vi zh_CN"
 
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS=""
-inherit cmake-utils ${VCS_ECLASS}
+inherit cmake-utils eutils l10n fdo-mime gnome2-utils
+[[ ${PV} = *9999* ]] && inherit git-r3
 
-DESCRIPTION="Qt4 based client for DirectConnect and ADC protocols, based on DC++ library"
-HOMEPAGE="http://eiskaltdc.googlecode.com/"
+DESCRIPTION="Qt based client for DirectConnect and ADC protocols, based on DC++ library"
+HOMEPAGE="https://code.google.com/p/eiskaltdc/"
 
 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 ) )
@@ -33,10 +30,10 @@ REQUIRED_USE="
 "
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://${PN/pp/}.googlecode.com/files/${P}.tar.xz"
+	SRC_URI="https://eiskaltdc.googlecode.com/files/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 else
-	EGIT_REPO_URI="git://github.com/${PN}/${PN}.git"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	KEYWORDS=""
 fi
 
@@ -70,6 +67,7 @@ RDEPEND="
 		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? (
@@ -94,16 +92,16 @@ pkg_pretend() {
 	fi
 }
 
-src_configure() {
-	# linguas
-	local langs x
-	for x in ${LANGS}; do
-		use linguas_${x} && langs+=" ${x}"
-	done
+src_prepare() {
+	l10n_find_plocales_changes 'eiskaltdcpp-qt/translations' '' '.ts'
+
+	epatch_user
+}
 
+src_configure() {
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-Dlinguas="${langs}"
+		-Dlinguas="$(l10n_get_locales)"
 		-DLOCAL_MINIUPNP=OFF
 		-DUSE_GTK=OFF
 		-DUSE_LIBGNOME2=OFF
@@ -133,3 +131,17 @@ src_configure() {
 	)
 	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
+}