gentoo resync : 27.03.2021

5 files changed, 2 insertions, 95 deletions

diff --git a/media-libs/lasi/Manifest b/media-libs/lasi/Manifest
index d72b4b37cbe9..71ad731674cf 100644
--- a/media-libs/lasi/Manifest
+++ b/media-libs/lasi/Manifest
@@ -1,9 +1,5 @@
-AUX lasi-1.1.0-cmake.patch 421 BLAKE2B 39ebb3759e055f045f406f59d9408c09f70a5496a76881f6a16621f3aa24364206360811f70f7db4b5a85f4583a525d1dd9de4fc28f45056bc8c4148cdfd6fd1 SHA512 f4218f6ed42c149dcbcefdee55e0332b83f5a6e039571cf9e0f600a60408071f9bd0d32fc0ea3286157719e164ec49221f84451353c1d3af7df5e58d7cae284b
-AUX lasi-1.1.0-pkgconfig.patch 701 BLAKE2B 50c59743897a07974e5329d1b0c039707533c4f3b0d51595b93faaf9abec034ae0407db59f4e112996210398fdabad4b4a0812f6888c1c6b83fe4b7bcb4a3854 SHA512 81b62d5491e19b6602bc622c5d1ed856a0950e209033de31773812815d221d741c78548edfc3fdc32230dca97de6e02ede79414aba1e803019299278d8c4e7da
 AUX lasi-1.1.3-cmake.patch 365 BLAKE2B 9e3944665e416a157c8cb5fa029723db5b551d7690fe6c7471f9e589093e5c136b17ec339ba0a93f96ce463be7fa1b01d734c361b3fe5061a445e13d64b036a3 SHA512 b1d6b6cb1d1f2d0006e1cac26d42f3b024f86687de87043208ad4a6c8cb94f9cd1b36d62df10bedd20729081d944c52645323420016cbf0d046c633f46f1b7cf
 AUX lasi-1.1.3-pkgconfig.patch 400 BLAKE2B b15c712c16bd70e92f80d0ab9b48edeadca75382191b54a34ac6c6dc2e0929491a7104e09c21c816b108e946f842d38f4506b71a62435785cf55acbaad13065d SHA512 fa7286b524163a6d2783758f368d60a2385012a10567ae30843daa9b72a22ddeb1fe767c24f271463bc60e27a370cd5292a6f35e6a5b5cf6f17b185f0797551a
-DIST libLASi-1.1.2.tar.gz 260948 BLAKE2B 044d906abadd902f91726c0e07e6ec364a3419bcea855a58cfeb44be30b2b9e0334c61931d3210750167ebc7599d8d4022960c40b0be68727385cf01b65780bb SHA512 5a03890b822946805025157497ce5f29fdfbcf5f2941bcd07841d9865cac9653697dbbba426f8527528affd4157e49d0f31a6dad79abdd52222dfcccf135ac91
 DIST libLASi-1.1.3.tar.gz 726769 BLAKE2B d8d06fb56e82b78f4342c959965de3908d70d1cec6147a6e3cc3d58ab4e9f978b7966c8e4507c0ff69e4ba3716270f38f3cfcafdc834001e3a0069a3495eda31 SHA512 036fb0ea1536d4ae04c0d9b5bd193ca6828228afe2cba6c1c7e12febd9b936bf3ac677711c122c44d3b12ab2f7b67f5e9dd18f44a4938ceaa2fbcc430a5748ac
-EBUILD lasi-1.1.2.ebuild 1296 BLAKE2B b5d56d8377396591ff84f093723001dabf498b1b70258092305ea70054eeebbab72c5ef2b79ca91da517131f936fa4caacb0fa11a67315c3f219da882418799c SHA512 2d2c91e1eae07f4776ddc86f228e1edda4358fb9ebb60a6c896a98c8731bf4b592fc1a11f49f346a6ce2df6156286feebe0f57dee9e11f4222e283127b72e12d
-EBUILD lasi-1.1.3.ebuild 1280 BLAKE2B 62c28f2564b00325934bcaa9d2d0271fd0187b3ce294f27208f13ce14a6c61161946e659c0e9a84190c92792889d2d3881be9cdb4e9eef7430fcf56424b635bc SHA512 76fa56954e54499212925179ec54415819fb88129b1f5aab632a89b6910aadd5f2948602886f0882d43e05c46957465569aa449ea4e032752c14f69bfcafe465
+EBUILD lasi-1.1.3.ebuild 1274 BLAKE2B ad09f419804b09eefe96367fd507944553afefb1eb4f600e0036d4fd20d5ac40cfb0c0275802187ae19797bed9fe4e9bd779bd099e5c764150229c18703083a4 SHA512 05fd04abae45fe74c410a9031a754f185a94f59fd81f7303bb55f44cfbed23d527d64adf9de1f600396bc5d239cf39051e76add049f87abf3bb9069d22a87052
 MISC metadata.xml 1218 BLAKE2B f6a5085f03d1bc69e88727d15754965b6db817bda61be0e71a7e7eb39262f3836de56e44498263f7c55ebdc2d58f7914e364fc23d11a1988a0ef4ca2883529c5 SHA512 c9688f2a9e74c81d7906d6609db72a7f29463c12800fb9e7922f1a4cd41db001722e5c5b102642464541e02d3a3f678fe0dd7013df9c8eace959dba3ba49ed71
diff --git a/media-libs/lasi/files/lasi-1.1.0-cmake.patch b/media-libs/lasi/files/lasi-1.1.0-cmake.patch
deleted file mode 100644
index 95a725c50325..000000000000
--- a/media-libs/lasi/files/lasi-1.1.0-cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/modules.orig/summary.cmake	2008-02-09 01:27:56.000000000 +0000
-+++ b/cmake/modules/summary.cmake	2008-11-04 16:25:59.968913787 +0000
-@@ -30,7 +30,7 @@
- 
- CMAKE_BUILD_TYPE:		${CMAKE_BUILD_TYPE}
- CMAKE_CXX_COMPILER:		${CMAKE_CXX_COMPILER}")
--if(NOT CMAKE_BUILD_TYPE)
-+if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "None")
- set(_output_results
- "${_output_results}
- CMAKE_CXX_FLAGS:		${CMAKE_CXX_FLAGS}")
diff --git a/media-libs/lasi/files/lasi-1.1.0-pkgconfig.patch b/media-libs/lasi/files/lasi-1.1.0-pkgconfig.patch
deleted file mode 100644
index 8eab557c8fcb..000000000000
--- a/media-libs/lasi/files/lasi-1.1.0-pkgconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur libLASi-1.1.0.orig/CMakeLists.txt libLASi-1.1.0/CMakeLists.txt
---- libLASi-1.1.0.orig/CMakeLists.txt	2010-04-29 14:24:58.000000000 +0300
-+++ libLASi-1.1.0/CMakeLists.txt	2010-04-29 14:28:54.000000000 +0300
-@@ -35,6 +35,7 @@
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/lasi.pc.in
- ${CMAKE_CURRENT_BINARY_DIR}/lasi.pc
-+@ONLY
- )
- 
- install(FILES
-diff -ur libLASi-1.1.0.orig/lasi.pc.in libLASi-1.1.0/lasi.pc.in
---- libLASi-1.1.0.orig/lasi.pc.in	2010-04-29 14:24:58.000000000 +0300
-+++ libLASi-1.1.0/lasi.pc.in	2010-04-29 14:26:25.000000000 +0300
-@@ -1,6 +1,6 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=${exec_prefix}/@libdir@
- includedir=@includedir@
- 
- Name: LASi
diff --git a/media-libs/lasi/lasi-1.1.2.ebuild b/media-libs/lasi/lasi-1.1.2.ebuild
deleted file mode 100644
index 80af78bde920..000000000000
--- a/media-libs/lasi/lasi-1.1.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib
-
-MY_PN=libLASi
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="C++ library for postscript stream output"
-HOMEPAGE="http://www.unifont.org/lasi/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/freetype:2
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0-cmake.patch
-	"${FILESDIR}"/${PN}-1.1.0-pkgconfig.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -i \
-		-e "s:\/lib$:\/$(get_libdir):" \
-		-e "s/libLASi-\${VERSION}/${PF}/" \
-		cmake/modules/instdirs.cmake \
-		|| die "Failed to fix cmake module"
-	sed -i \
-		-e "s:\${DATA_DIR}/examples:/usr/share/doc/${PF}/examples:" \
-		examples/CMakeLists.txt || die
-
-	use examples || sed -i -e '/add_subdirectory(examples)/d' CMakeLists.txt
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE=None
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-	use doc || mycmakeargs+=( -DDOXYGEN_EXECUTABLE= )
-	cmake-utils_src_configure
-}
diff --git a/media-libs/lasi/lasi-1.1.3.ebuild b/media-libs/lasi/lasi-1.1.3.ebuild
index 574329452bea..c2f08f49bcb8 100644
--- a/media-libs/lasi/lasi-1.1.3.ebuild
+++ b/media-libs/lasi/lasi-1.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="