[gentoo-commits] repo/proj/guru:dev commit in: net-misc/lagrange/

[Anna Vyalkova]

commit:     9ffaee9d06897f457de779e99b90e89c5130cbb8
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Tue Jun 15 18:59:33 2021 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Tue Jun 15 20:32:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9ffaee9d

net-misc/lagrange: move from SwordArMor overlay

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 net-misc/lagrange/Manifest              |  2 +-
 net-misc/lagrange/lagrange-1.5.1.ebuild | 43 ---------------------------------
 net-misc/lagrange/lagrange-1.5.2.ebuild | 42 ++++++++++++++++++++++++++++++++
 net-misc/lagrange/lagrange-9999.ebuild  | 43 ---------------------------------
 net-misc/lagrange/metadata.xml          | 33 +++++++++++++++++--------
 5 files changed, 66 insertions(+), 97 deletions(-)

diff --git a/net-misc/lagrange/Manifest b/net-misc/lagrange/Manifest
index a33632c29..8acd7b87a 100644
--- a/net-misc/lagrange/Manifest
+++ b/net-misc/lagrange/Manifest
@@ -1 +1 @@
-DIST lagrange-1.5.1.tar.gz 20406988 BLAKE2B faae5c415fb8eb36a8301adff0ea330c11aab861c5e134a7b2601903877fbbb9d3369719151048740f35ea1fd7e3032a02b9e2287a7f7eef4864d05a0e643d25 SHA512 b5ee3ff9718c7bf4542a1f7b92b6efdd2360c01ebba2b380e0458762d317bf54c57e2c171b6d6b11a7b308255de7ce2f76905c17f70d7c0c971e48c95d15d991
+DIST lagrange-1.5.2.tar.gz 20409523 BLAKE2B 3f8888d7012f7886a61c938c5527639495d0dc424185133b663aec4e90e8de604863bac481a87606cfc5af80a3974503124a8ac7e5924a034053a1cbca705abd SHA512 971d54d072799cc03bc2521571c74e3da996f390198c3a7e04ff8480040aa1ae96d1407dec68ecb02225ece14c0032304ad1c605b6619b4538d9078c8180f9d6

diff --git a/net-misc/lagrange/lagrange-1.5.1.ebuild b/net-misc/lagrange/lagrange-1.5.1.ebuild
deleted file mode 100644
index 0a712028c..000000000
--- a/net-misc/lagrange/lagrange-1.5.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="A Beautiful Gemini Client"
-HOMEPAGE="https://gmi.skyjake.fi/lagrange/"
-if [ "${PV}" == "9999" ]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://git.skyjake.fi/gemini/${PN}.git"
-else
-	SRC_URI="https://git.skyjake.fi/skyjake/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD-2"
-SLOT=0
-IUSE="mpg123"
-
-RDEPEND="
-	>=dev-libs/openssl-1.1.1
-	media-libs/libsdl2
-	dev-libs/libpcre
-	sys-libs/zlib
-	dev-libs/libunistring
-	mpg123? ( media-sound/mpg123 )
-"
-
-src_configure() {
-	if use mpg123; then
-		mycmakeargs+=("-DENABLE_MPG123")
-	fi
-	mycmakeargs+=("-DCMAKE_BUILD_TYPE=Release")
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}

diff --git a/net-misc/lagrange/lagrange-1.5.2.ebuild b/net-misc/lagrange/lagrange-1.5.2.ebuild
new file mode 100644
index 000000000..ad1bce38f
--- /dev/null
+++ b/net-misc/lagrange/lagrange-1.5.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Desktop GUI client for browsing Geminispace"
+HOMEPAGE="https://gmi.skyjake.fi/lagrange/
+https://git.skyjake.fi/gemini/lagrange"
+SRC_URI="https://git.skyjake.fi/gemini/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MIT Unlicense ) Apache-2.0 BSD-2 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse4_1 +mp3"
+
+DEPEND="
+	dev-libs/libpcre
+	dev-libs/libunistring
+	dev-libs/openssl
+	media-libs/libsdl2
+	sys-libs/zlib
+	mp3? ( media-sound/mpg123 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_MPG123=$(usex mp3)
+
+		# lib/the_Foundation
+		-DTFDN_ENABLE_WARN_ERROR=OFF
+		-DTFDN_ENABLE_SSE41=$(usex cpu_flags_x86_sse4_1)
+	)
+
+	cmake_src_configure
+}

diff --git a/net-misc/lagrange/lagrange-9999.ebuild b/net-misc/lagrange/lagrange-9999.ebuild
deleted file mode 100644
index 0a712028c..000000000
--- a/net-misc/lagrange/lagrange-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="A Beautiful Gemini Client"
-HOMEPAGE="https://gmi.skyjake.fi/lagrange/"
-if [ "${PV}" == "9999" ]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://git.skyjake.fi/gemini/${PN}.git"
-else
-	SRC_URI="https://git.skyjake.fi/skyjake/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD-2"
-SLOT=0
-IUSE="mpg123"
-
-RDEPEND="
-	>=dev-libs/openssl-1.1.1
-	media-libs/libsdl2
-	dev-libs/libpcre
-	sys-libs/zlib
-	dev-libs/libunistring
-	mpg123? ( media-sound/mpg123 )
-"
-
-src_configure() {
-	if use mpg123; then
-		mycmakeargs+=("-DENABLE_MPG123")
-	fi
-	mycmakeargs+=("-DCMAKE_BUILD_TYPE=Release")
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}

diff --git a/net-misc/lagrange/metadata.xml b/net-misc/lagrange/metadata.xml
index e3edec442..8472ce9d7 100644
--- a/net-misc/lagrange/metadata.xml
+++ b/net-misc/lagrange/metadata.xml
@@ -2,19 +2,32 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>strikersh@×××××××.org</email>
-		<name>Jules de Sartiges</name>
+		<email>alarig@××××××××××.fr</email>
+		<name>Alarig Le Lay</name>
 	</maintainer>
-	<use>
-		<flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123</flag>
-	</use>
-	<longdescription lang="en">
-		Lagrange is a desktop GUI client for browsing Geminispace. It
-		offers modern conveniences familiar from web browsers, such as
-		smooth scrolling, inline image viewing, multiple tabs, visual
-		themes, Unicode fonts, bookmarks, history, and page outlines.
+	<maintainer type="person">
+		<email>cyber+gentoo@×××××.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<longdescription>
+		Lagrange is a desktop GUI client for browsing Geminispace.
+		It offers modern conveniences familiar from web browsers,
+		such as smooth scrolling, inline image viewing, multiple
+		tabs, visual themes, Unicode fonts, bookmarks, history, and
+		page outlines.
+
+		Like the Gemini protocol, Lagrange has been designed with
+		minimalism in mind. It depends on a small number of essential
+		libraries. It is written in C and uses SDL for
+		hardware-accelerated graphics. OpenSSL is used for secure
+		communications.
 	</longdescription>
 	<upstream>
+		<maintainer>
+			<email>jaakko.keranen@×××.fi</email>
+			<name>Jaakko Keränen</name>
+		</maintainer>
 		<bugs-to>https://github.com/skyjake/lagrange/issues</bugs-to>
+		<remote-id type="github">skyjake/lagrange</remote-id>
 	</upstream>
 </pkgmetadata>