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 A5F7A1388C1 for ; Thu, 10 Dec 2015 20:46:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E044121C027; Thu, 10 Dec 2015 20:46:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 78A8521C027 for ; Thu, 10 Dec 2015 20:46:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 766D33407B8 for ; Thu, 10 Dec 2015 20:46:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 09B94AF3 for ; Thu, 10 Dec 2015 20:46:21 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1449780316.c9e81c80c359ef78badf23197fa9525755dd416d.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/kvirc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/kvirc/kvirc-9999.ebuild X-VCS-Directories: net-irc/kvirc/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: c9e81c80c359ef78badf23197fa9525755dd416d X-VCS-Branch: master Date: Thu, 10 Dec 2015 20:46:21 +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: e9598dbb-714e-40b8-9f11-a94dad6ebe73 X-Archives-Hash: 97491be495ec1c527eaf2c2df3cbc5d7 commit: c9e81c80c359ef78badf23197fa9525755dd416d Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Thu Dec 10 20:14:34 2015 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Dec 10 20:45:16 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9e81c80 net-irc/kvirc: Switch to git. net-irc/kvirc/kvirc-9999.ebuild | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild index 16b7304..6dfdba4 100644 --- a/net-irc/kvirc/kvirc-9999.ebuild +++ b/net-irc/kvirc/kvirc-9999.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" PYTHON_DEPEND="python? 2" -inherit cmake-utils flag-o-matic multilib python subversion +inherit cmake-utils flag-o-matic git-r3 multilib python DESCRIPTION="Advanced IRC Client" HOMEPAGE="http://www.kvirc.net/" SRC_URI="" -ESVN_REPO_URI="https://svn.kvirc.de/svn/trunk/kvirc" -ESVN_PROJECT="kvirc" +EGIT_REPO_URI="https://github.com/kvirc/KVIrc" LICENSE="kvirc" SLOT="4" @@ -53,10 +52,10 @@ pkg_setup() { } src_prepare() { - subversion_wc_info - VERSIO_PRAESENS="${ESVN_WC_REVISION}" - einfo "Setting of revision number to ${VERSIO_PRAESENS}" - sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" r${VERSIO_PRAESENS}\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed" + KVIRC_GIT_REVISION="$(git show -s --format=%H)" + KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)" + einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}" + sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed" } src_configure() { @@ -65,7 +64,8 @@ src_configure() { local libdir="$(get_libdir)" local mycmakeargs=( -DLIB_SUFFIX=${libdir#lib} - -DMANUAL_REVISION=${VERSIO_PRAESENS} + -DMANUAL_REVISION=${KVIRC_GIT_REVISION} + -DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/} -DWANT_COEXISTENCE=1 -DWANT_CRYPT=1 -DWANT_ENV_FLAGS=1