From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4D3111381F3 for ; Thu, 6 Jun 2013 19:58:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34D57E078C; Thu, 6 Jun 2013 19:58:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B33B5E078C for ; Thu, 6 Jun 2013 19:58:39 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF44533E3F4 for ; Thu, 6 Jun 2013 19:58:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 76F53E468F for ; Thu, 6 Jun 2013 19:58:37 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1370548701.5c59649407f2a63dc6e4def8147b40c8b55e3f62.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kopete/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kopete/kopete-4.10.49.9999.ebuild kde-base/kopete/kopete-9999.ebuild X-VCS-Directories: kde-base/kopete/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 5c59649407f2a63dc6e4def8147b40c8b55e3f62 X-VCS-Branch: master Date: Thu, 6 Jun 2013 19:58:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 10b218bc-d20c-4039-8cff-04a65934bee9 X-Archives-Hash: ca92c6fe0a1ebc38bba2b4d762e4dedc commit: 5c59649407f2a63dc6e4def8147b40c8b55e3f62 Author: Johannes Huber gentoo org> AuthorDate: Thu Jun 6 19:58:21 2013 +0000 Commit: Johannes Huber gentoo org> CommitDate: Thu Jun 6 19:58:21 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5c596494 [kde-base/kopete] Moved to git by upstream. Package-Manager: portage-2.2.0_alpha177 --- kde-base/kopete/kopete-4.10.49.9999.ebuild | 19 ++++++++++++------- kde-base/kopete/kopete-9999.ebuild | 12 +++++------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/kde-base/kopete/kopete-4.10.49.9999.ebuild b/kde-base/kopete/kopete-4.10.49.9999.ebuild index 18c304d..0274266 100644 --- a/kde-base/kopete/kopete-4.10.49.9999.ebuild +++ b/kde-base/kopete/kopete-4.10.49.9999.ebuild @@ -4,10 +4,15 @@ EAPI=5 +if [[ $PV != *9999 ]]; then + KMNAME="kdenetwork" + KDE_ECLASS=meta +else + KDE_ECLASS=base +fi + KDE_HANDBOOK="optional" -KMNAME="kdenetwork" -KDE_SCM="svn" -inherit kde4-meta multilib +inherit kde4-${KDE_ECLASS} multilib DESCRIPTION="KDE multi-protocol IM client" KEYWORDS="" @@ -111,9 +116,9 @@ DEPEND="${COMMONDEPEND} src_prepare() { sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \ - -i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed" + -i protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed" - kde4-meta_src_prepare + kde4-${KDE_ECLASS}_src_prepare } src_configure() { @@ -144,11 +149,11 @@ src_configure() { mycmakeargs+=($(cmake-utils_use_with ${x/+/})) done - kde4-meta_src_configure + kde4-${KDE_ECLASS}_src_configure } pkg_postinst() { - kde4-meta_pkg_postinst + kde4-${KDE_ECLASS}_pkg_postinst #if use telepathy; then # elog "To use kopete telepathy plugins, you need to start gabble first:" diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild index 18c304d..3024e3b 100644 --- a/kde-base/kopete/kopete-9999.ebuild +++ b/kde-base/kopete/kopete-9999.ebuild @@ -5,9 +5,7 @@ EAPI=5 KDE_HANDBOOK="optional" -KMNAME="kdenetwork" -KDE_SCM="svn" -inherit kde4-meta multilib +inherit kde4-base multilib DESCRIPTION="KDE multi-protocol IM client" KEYWORDS="" @@ -111,9 +109,9 @@ DEPEND="${COMMONDEPEND} src_prepare() { sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \ - -i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed" + -i protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed" - kde4-meta_src_prepare + kde4-base_src_prepare } src_configure() { @@ -144,11 +142,11 @@ src_configure() { mycmakeargs+=($(cmake-utils_use_with ${x/+/})) done - kde4-meta_src_configure + kde4-base_src_configure } pkg_postinst() { - kde4-meta_pkg_postinst + kde4-base_pkg_postinst #if use telepathy; then # elog "To use kopete telepathy plugins, you need to start gabble first:"