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 369EE1396D0 for ; Fri, 15 Sep 2017 19:05:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F011E0BE7; Fri, 15 Sep 2017 19:05:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1847EE0BE7 for ; Fri, 15 Sep 2017 19:05:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 B788933BE4E for ; Fri, 15 Sep 2017 19:05:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2CC259096 for ; Fri, 15 Sep 2017 19:05:53 +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: <1505502281.f776830f77066d0e39ebb191869429b9916cf86e.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-misc/kdiff3/Manifest kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild X-VCS-Directories: kde-misc/kdiff3/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: f776830f77066d0e39ebb191869429b9916cf86e X-VCS-Branch: master Date: Fri, 15 Sep 2017 19:05:53 +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: 0c48c9e0-d98f-46ce-afdb-c8f1c49b8eec X-Archives-Hash: 2e9ac4ca4a8b7b0fcde9dff1125b5f8a commit: f776830f77066d0e39ebb191869429b9916cf86e Author: Johannes Huber gentoo org> AuthorDate: Fri Sep 15 19:04:41 2017 +0000 Commit: Johannes Huber gentoo org> CommitDate: Fri Sep 15 19:04:41 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f776830f kde-misc/kdiff3: Drop slot 4 Package-Manager: Portage-2.3.8, Repoman-2.3.3 kde-misc/kdiff3/Manifest | 1 - kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild | 48 --------------------------------- 2 files changed, 49 deletions(-) diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest index 5c0a801aaff..2b2a91ba132 100644 --- a/kde-misc/kdiff3/Manifest +++ b/kde-misc/kdiff3/Manifest @@ -1,2 +1 @@ -DIST kdiff3-0.9.98.tar.gz 1762715 SHA256 802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668 SHA512 867f0b1d5beb421f1bf84e6044d8d9279d434900faa1962fd5417653ef6b1cc71a8f5dd6c29cd4826a1c70a6075786faeaee780548521ce2ce221d83229b52e6 WHIRLPOOL 4099488985182d36fc4ecf532914c1439273036e38b66f7584282b6b232c3c4a738ecab35dd8b1a30b9a368cf6a6f9aeebea38e921063b55ac3972f46e118c98 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 SHA256 ed764a5380818424b629e6474eb24e7c4dd2d8af3b443caeb15761908918e97e SHA512 847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64 WHIRLPOOL 1916fe160b98659dac3b9e9962aba3fdfe9f46a602c3eaa56be59bda9caac572ad612fbac4106b07f6bdb288a4b2ba95e0d53e48431d63beb6bbcd2fb5358472 diff --git a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild deleted file mode 100644 index 3490fd344f0..00000000000 --- a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit qmake-utils - -DESCRIPTION="Qt/KDE based frontend to diff3" -HOMEPAGE="http://kdiff3.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="4" -KEYWORDS="amd64 x86 ~amd64-linux" -IUSE="qt5" - -DEPEND=" - !qt5? ( dev-qt/qtcore:4 - dev-qt/qtgui:4 ) - qt5? ( dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 ) -" -RDEPEND="${DEPEND} - sys-apps/diffutils -" - -RESTRICT="test" - -src_prepare() { - default - # adapt to Gentoo paths - sed -e s,documentation.path.*$,documentation.path\ =\ "${EPREFIX}"/usr/share/doc/"${PF}", \ - -e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, -i src-QT4/kdiff3.pro || die -} - -src_configure() { - if ! use qt5; then - eqmake4 "${S}"/src-QT4/kdiff3.pro - else - eqmake5 "${S}"/src-QT4/kdiff3.pro - fi -} - -src_install() { - emake INSTALL_ROOT="${D}" install -}