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 512C959CAF for ; Thu, 7 Apr 2016 15:51:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D25A21C038; Thu, 7 Apr 2016 15:51:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 825D621C030 for ; Thu, 7 Apr 2016 15:51:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A8273340D83 for ; Thu, 7 Apr 2016 15:51:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C3EC15F for ; Thu, 7 Apr 2016 15:51:23 +0000 (UTC) From: "Michael Palimaka" 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 Palimaka" Message-ID: <1460044270.d252e9aa713c90c2c78fdf4575f19af78eaac6e6.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/ktp-text-ui/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/ktp-text-ui/ktp-text-ui-15.12.3.ebuild kde-apps/ktp-text-ui/ktp-text-ui-16.04.49.9999.ebuild kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild X-VCS-Directories: kde-apps/ktp-text-ui/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: d252e9aa713c90c2c78fdf4575f19af78eaac6e6 X-VCS-Branch: master Date: Thu, 7 Apr 2016 15:51:23 +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: 4d22aa89-88fc-408d-95bf-93862a01f62a X-Archives-Hash: 198a8a8b3fe5218782fa930a7de16af7 commit: d252e9aa713c90c2c78fdf4575f19af78eaac6e6 Author: Michael Palimaka gentoo org> AuthorDate: Thu Apr 7 15:51:10 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Apr 7 15:51:10 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d252e9aa kde-apps/ktp-text-ui: further license improvements Package-Manager: portage-2.2.28 kde-apps/ktp-text-ui/ktp-text-ui-15.12.3.ebuild | 2 +- kde-apps/ktp-text-ui/ktp-text-ui-16.04.49.9999.ebuild | 2 +- kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-15.12.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-15.12.3.ebuild index b6b821e..1a1a24b 100644 --- a/kde-apps/ktp-text-ui/ktp-text-ui-15.12.3.ebuild +++ b/kde-apps/ktp-text-ui/ktp-text-ui-15.12.3.ebuild @@ -9,7 +9,7 @@ inherit kde5 DESCRIPTION="KDE Telepathy text chat window" HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration" -LICENSE="Apache-2.0 AFL-2.1 BSD GPL-2+ LGPL-2.1+ MIT" +LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT" KEYWORDS="~amd64 ~x86" IUSE="speech" diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-16.04.49.9999.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-16.04.49.9999.ebuild index 8809e3c..d372a8f 100644 --- a/kde-apps/ktp-text-ui/ktp-text-ui-16.04.49.9999.ebuild +++ b/kde-apps/ktp-text-ui/ktp-text-ui-16.04.49.9999.ebuild @@ -9,7 +9,7 @@ inherit kde5 DESCRIPTION="KDE Telepathy text chat window" HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration" -LICENSE="Apache-2.0 AFL-2.1 BSD GPL-2+ LGPL-2.1+ MIT" +LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT" KEYWORDS="" IUSE="speech" diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild index 8809e3c..d372a8f 100644 --- a/kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild +++ b/kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild @@ -9,7 +9,7 @@ inherit kde5 DESCRIPTION="KDE Telepathy text chat window" HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration" -LICENSE="Apache-2.0 AFL-2.1 BSD GPL-2+ LGPL-2.1+ MIT" +LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT" KEYWORDS="" IUSE="speech"