From c27006fa77f83e12a4d665abb95dba188802e1a0 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 20 Dec 2020 12:19:18 +0100
Subject: app-arch/stormlib: Use system libtomcrypt, fix missing DEPEND
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 app-arch/stormlib/stormlib-9.23-r1.ebuild | 41 +++++++++++++++++++++++++++++++
 app-arch/stormlib/stormlib-9.23.ebuild    | 39 -----------------------------
 2 files changed, 41 insertions(+), 39 deletions(-)
 create mode 100644 app-arch/stormlib/stormlib-9.23-r1.ebuild
 delete mode 100644 app-arch/stormlib/stormlib-9.23.ebuild

(limited to 'app-arch')

diff --git a/app-arch/stormlib/stormlib-9.23-r1.ebuild b/app-arch/stormlib/stormlib-9.23-r1.ebuild
new file mode 100644
index 000000000000..484b8ef3e37f
--- /dev/null
+++ b/app-arch/stormlib/stormlib-9.23-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P=StormLib-${PV}
+DESCRIPTION="Library to read and write MPQ archives (Diablo, StarCraft)"
+HOMEPAGE="
+	http://www.zezula.net/en/mpq/stormlib.html
+	https://github.com/ladislav-zezula/StormLib"
+SRC_URI="
+	https://github.com/ladislav-zezula/StormLib/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-arch/bzip2:=
+	dev-libs/libtomcrypt:=[libtommath]
+	sys-libs/zlib:="
+DEPEND=${RDEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/stormlib-9.23-gnuinstalldirs.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		# interactive test app
+		-DSTORM_BUILD_TESTS=OFF
+		-DWITH_LIBTOMCRYPT=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/app-arch/stormlib/stormlib-9.23.ebuild b/app-arch/stormlib/stormlib-9.23.ebuild
deleted file mode 100644
index 3e60afca6b70..000000000000
--- a/app-arch/stormlib/stormlib-9.23.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P=StormLib-${PV}
-DESCRIPTION="Library to read and write MPQ archives (Diablo, StarCraft)"
-HOMEPAGE="
-	http://www.zezula.net/en/mpq/stormlib.html
-	https://github.com/ladislav-zezula/StormLib"
-SRC_URI="
-	https://github.com/ladislav-zezula/StormLib/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-arch/bzip2:=
-	sys-libs/zlib:="
-
-PATCHES=(
-	"${FILESDIR}"/stormlib-9.23-gnuinstalldirs.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		# interactive test app
-		-DSTORM_BUILD_TESTS=OFF
-		# -DWITH_LIBTOMCRYPT=ON when we have tomcrypt packaged
-	)
-
-	cmake_src_configure
-}
-- 
cgit v1.2.3-65-gdbad