From a05a9c27edd20beb29be8736cdaab0cee9b9666b Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 11 Dec 2021 10:42:05 +0100
Subject: kde-apps/kitinerary: Drop obsolete x86 quirk

Bug: https://bugs.gentoo.org/823854
Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 kde-apps/kitinerary/kitinerary-21.12.0-r1.ebuild | 51 +++++++++++++++++++++++
 kde-apps/kitinerary/kitinerary-21.12.0.ebuild    | 52 ------------------------
 2 files changed, 51 insertions(+), 52 deletions(-)
 create mode 100644 kde-apps/kitinerary/kitinerary-21.12.0-r1.ebuild
 delete mode 100644 kde-apps/kitinerary/kitinerary-21.12.0.ebuild

(limited to 'kde-apps')

diff --git a/kde-apps/kitinerary/kitinerary-21.12.0-r1.ebuild b/kde-apps/kitinerary/kitinerary-21.12.0-r1.ebuild
new file mode 100644
index 000000000000..2eaa9b47d547
--- /dev/null
+++ b/kde-apps/kitinerary/kitinerary-21.12.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.88.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
+HOMEPAGE="https://apps.kde.org/kontact/"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+barcode pdf"
+
+REQUIRED_USE="test? ( pdf )"
+
+DEPEND="
+	dev-libs/libphonenumber
+	dev-libs/libxml2:2
+	dev-libs/openssl:=
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kpkpass-${PVCUT}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	sys-libs/zlib
+	barcode? ( >=media-libs/zxing-cpp-1.1.0 )
+	pdf? ( app-text/poppler:=[qt5] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="x11-misc/shared-mime-info"
+
+src_configure() {
+	local mycmakeargs=(
+		# sci-geosciences/osmctools; TODO: useful at all?
+		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON
+		$(cmake_use_find_package barcode ZXing)
+		$(cmake_use_find_package pdf Poppler)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kitinerary/kitinerary-21.12.0.ebuild b/kde-apps/kitinerary/kitinerary-21.12.0.ebuild
deleted file mode 100644
index 54bcf4487430..000000000000
--- a/kde-apps/kitinerary/kitinerary-21.12.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.88.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+barcode pdf"
-
-REQUIRED_USE="test? ( pdf )"
-
-DEPEND="
-	dev-libs/libxml2:2
-	dev-libs/openssl:=
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpkpass-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	sys-libs/zlib
-	barcode? ( >=media-libs/zxing-cpp-1.1.0 )
-	pdf? ( app-text/poppler:=[qt5] )
-	!x86? ( dev-libs/libphonenumber )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="x11-misc/shared-mime-info"
-
-src_configure() {
-	local mycmakeargs=(
-		# sci-geosciences/osmctools; TODO: useful at all?
-		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_PhoneNumber=$(usex !x86) # temporary, bug 823854
-		$(cmake_use_find_package barcode ZXing)
-		$(cmake_use_find_package pdf Poppler)
-	)
-	ecm_src_configure
-}
-- 
cgit v1.2.3-65-gdbad