From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B26D8139083 for ; Fri, 22 Dec 2017 09:01:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED115E0E9B; Fri, 22 Dec 2017 09:01:35 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C19AAE0E9B for ; Fri, 22 Dec 2017 09:01:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A8B9F340CC0 for ; Fri, 22 Dec 2017 09:01:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43EA8AE7E for ; Fri, 22 Dec 2017 09:01:33 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <1513933284.a08d03188dcbdecf81d56a9445a0351a1aa265cd.xmw@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/backintime/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/backintime/backintime-1.1.24.ebuild app-backup/backintime/backintime-9999.ebuild X-VCS-Directories: app-backup/backintime/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: a08d03188dcbdecf81d56a9445a0351a1aa265cd X-VCS-Branch: master Date: Fri, 22 Dec 2017 09:01:33 +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: 2aca2094-2722-4ae7-8dc9-66454f403b3c X-Archives-Hash: 42de8d72860d00ba7b14bec12ddbfbd3 commit: a08d03188dcbdecf81d56a9445a0351a1aa265cd Author: Michael Weber gentoo org> AuthorDate: Fri Dec 22 09:01:15 2017 +0000 Commit: Michael Weber gentoo org> CommitDate: Fri Dec 22 09:01:24 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a08d0318 app-backup/backintime: Add live ebuild and update HOMEPAGE (thanks Samuel Bauer). Closes: https://bugs.gentoo.org/641600 Bug: https://bugs.gentoo.org/641962 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-backup/backintime/backintime-1.1.24.ebuild | 4 +-- ...intime-1.1.24.ebuild => backintime-9999.ebuild} | 32 +++++++++++----------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app-backup/backintime/backintime-1.1.24.ebuild b/app-backup/backintime/backintime-1.1.24.ebuild index a72918d9c63..e06ed0d2629 100644 --- a/app-backup/backintime/backintime-1.1.24.ebuild +++ b/app-backup/backintime/backintime-1.1.24.ebuild @@ -3,12 +3,12 @@ EAPI=6 -PYTHON_COMPAT=( python3_{4,5} ) +PYTHON_COMPAT=( python3_{4,5,6} ) inherit eutils python-single-r1 gnome2-utils DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4" -HOMEPAGE="https://backintime.readthedocs.io/" +HOMEPAGE="https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/" SRC_URI="https://github.com/bit-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" diff --git a/app-backup/backintime/backintime-1.1.24.ebuild b/app-backup/backintime/backintime-9999.ebuild similarity index 71% copy from app-backup/backintime/backintime-1.1.24.ebuild copy to app-backup/backintime/backintime-9999.ebuild index a72918d9c63..1bff0ab51ba 100644 --- a/app-backup/backintime/backintime-1.1.24.ebuild +++ b/app-backup/backintime/backintime-9999.ebuild @@ -3,18 +3,18 @@ EAPI=6 -PYTHON_COMPAT=( python3_{4,5} ) +PYTHON_COMPAT=( python3_{4,5,6} ) -inherit eutils python-single-r1 gnome2-utils +inherit eutils python-single-r1 gnome2-utils git-r3 DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4" -HOMEPAGE="https://backintime.readthedocs.io/" -SRC_URI="https://github.com/bit-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/" +EGIT_REPO_URI="https://github.com/bit-team/backintime/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="qt4" +KEYWORDS="" +IUSE="qt5" DEPEND="${PYTHON_DEPS} dev-python/dbus-python[${PYTHON_USEDEP}] @@ -22,7 +22,7 @@ DEPEND="${PYTHON_DEPS} net-misc/openssh net-misc/rsync[xattr,acl]" RDEPEND="${DEPEND} - qt4? ( dev-python/PyQt4 )" + qt5? ( dev-python/PyQt5 )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -30,12 +30,12 @@ src_prepare() { #fix doc install location sed -e "s:/doc/${PN}-common:/doc/${PF}:g" \ -i common/configure || die - sed -e "s:/doc/${PN}-qt4:/doc/${PF}:g" \ - -i qt4/configure || die + sed -e "s:/doc/${PN}-qt:/doc/${PF}:g" \ + -i qt/configure || die sed -e "/addInstallFile \"..\/VERSION/d" \ -e "/addInstallFile \"..\/LICENSE/d" \ -e "/addInstallFile \"..\/debian\/copyright/d" \ - -i {qt4,common}/configure || die + -i {qt,common}/configure || die if [ -n ${LINGUAS+x} ] ; then cd common/po || die @@ -52,8 +52,8 @@ src_prepare() { src_configure() { cd "${S}"/common || die ./configure --python3 --no-fuse-group || die - if use qt4 ; then - cd "${S}"/qt4 || die + if use qt5 ; then + cd "${S}"/qt || die ./configure --python3 || die fi } @@ -61,8 +61,8 @@ src_configure() { src_compile() { cd "${S}"/common || die emake - if use qt4 ; then - cd "${S}"/qt4 || die + if use qt5 ; then + cd "${S}"/qt || die emake fi } @@ -70,8 +70,8 @@ src_compile() { src_install() { cd "${S}"/common || die emake DESTDIR="${D}" install - if use qt4 ; then - cd "${S}"/qt4 || die + if use qt5 ; then + cd "${S}"/qt || die emake DESTDIR="${D}" install fi