gentoo resync : 20.10.2021

4 files changed, 2 insertions, 232 deletions

diff --git a/dev-libs/qqwing/Manifest b/dev-libs/qqwing/Manifest
index 770856a6028e..432f89007b58 100644
--- a/dev-libs/qqwing/Manifest
+++ b/dev-libs/qqwing/Manifest
@@ -1,6 +1,3 @@
-AUX qqwing-1.3.0-autotools.patch 5417 BLAKE2B 9314f4e0c85b8bf646b22ebd13409b305f05a25eecaaced65ba76b307a0c062eee7a9dbdc79c4ecab69d84756c646caf6e69183ad3621379aef14492b91f1ad6 SHA512 cdb88b9a07cf5c68790c4ce7e6f1156dff4c985c0f65bd73f81556d41570be5789d8fce53594bcd698fdf182dfa0f88618f49fbdaee153b5dcb4c833553ff515
-DIST qqwing-1.3.3.tar.gz 89629 BLAKE2B 5583318d15a4bf31833576bec037ab27fc17a57c95ef42be828ae0de9d6d86709fdcb63f71cf51b737b45c39657220e1e14a817094065f29b17c668f53b16075 SHA512 cce6e3122f0620b4a27f5c4186b468906006b6f9deda0b3fc474d40e678722bbb07474c479a75cbcac0812a097e5be4d7ae58339810a897f966d5a73b07a6833
 DIST qqwing-1.3.4.tar.gz 352060 BLAKE2B cf78a3d06c529ab1d47739ee0914e268fe8375d5dd7eb73a05ed91fcd7231b0f2103ae2490a8edf438ebce5ec77457f2686338edb61c38a804af34df78763c31 SHA512 6762b97d7595e7831edb80d9fac06ca784c6dfb6c5717e72adaac6973ec94bec417806f8ae4b80ed95b876388c8c1a00906b0fa8653a115998c5170db25aab0d
-EBUILD qqwing-1.3.3.ebuild 489 BLAKE2B 6a7a6bb5ae79a76ec00bfd818c15817c3ec12abbc580c8a6358f7e323056d95450908363bf562f1af5f9704b0215a8559e0e02fcab32529857344335af15ba03 SHA512 3d78c8ef369708afd53aab36d7166add1b9f009ce68cbf25b621db4e9e3ad57412f02b341c3ee773e67deeeeace069c0588693df95bbeac207d45d61d4b60684
-EBUILD qqwing-1.3.4.ebuild 364 BLAKE2B d8c9a7f0e534fa4587d89b264d25a1fa6b43999a896ebd73eb88dfbbd84c5b7aba4871792d98de323c6054d0a13415c7ee6dbebfee63317ab339d5f936fab0a3 SHA512 f2adb6a4bddee3545bb7d2480808d97df181e751637e8aa09814bd705cb4106f143f5f81d6c0561562285a0f5cdb92a21789a3af18c7fd49d7f52a6846b541f6
+EBUILD qqwing-1.3.4.ebuild 364 BLAKE2B 1c1c9704e93059764f543364122fc5bee16e1d8553804b8de8f0806dc235d8631445558268b13bbf0d4f7aecf4e93b943439ddb44e2173001bdd8ca607650dd3 SHA512 e3d5857fabafebc2699d4243085a2b1fad7c5f3035522227705b3352e3d09a43d32aeba2604948b3be209d33afd7b860f56593637b07d5c1e61b8706fab458ed
 MISC metadata.xml 344 BLAKE2B 7ccab937a954c7bf6a62964af9cf5da988d468441feea89de8c82870e4d414b8d916e63db83e026886c636d5d204d4415581a84b408e8e453293285e94d3cd38 SHA512 d3bb75e12aee5f1d3126b583c178048d365f28bb219953e32d20b1b59e809d24e916ae81617b16f3e31a5ba9f9ddd87cac9fa20e38a65d757fa41184f8f51640
diff --git a/dev-libs/qqwing/files/qqwing-1.3.0-autotools.patch b/dev-libs/qqwing/files/qqwing-1.3.0-autotools.patch
deleted file mode 100644
index 1a7bf41aeaf7..000000000000
--- a/dev-libs/qqwing/files/qqwing-1.3.0-autotools.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-From d94d718154c065218bc9db8ccfe638d84b86bdb4 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 18 Oct 2014 13:02:58 +0200
-Subject: [PATCH] Make autotools a bit saner
-
----
- Makefile.am        | 16 ++++++++++++++++
- build/Makefile.am  | 17 -----------------
- build/configure.ac | 47 -----------------------------------------------
- build/qqwing.pc.in | 10 ----------
- configure.ac       | 47 +++++++++++++++++++++++++++++++++++++++++++++++
- qqwing.pc.in       | 10 ++++++++++
- 6 files changed, 73 insertions(+), 74 deletions(-)
- create mode 100644 Makefile.am
- delete mode 100644 build/Makefile.am
- delete mode 100755 build/configure.ac
- delete mode 100755 build/qqwing.pc.in
- create mode 100644 configure.ac
- create mode 100644 qqwing.pc.in
-
-diff --git a/Makefile.am b/Makefile.am
-new file mode 100644
-index 0000000..d6109ba
---- /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1,16 @@
-+ACLOCAL_AMFLAGS = -I m4
-+
-+include_HEADERS = src/cpp/qqwing.hpp
-+
-+lib_LTLIBRARIES = libqqwing.la
-+libqqwing_la_SOURCES = src/cpp/qqwing.cpp src/cpp/qqwing.hpp
-+libqqwing_la_LDFLAGS = -no-undefined -version-info $(QQWING_CURRENT):$(QQWING_REVISION):$(QQWING_AGE)
-+
-+bin_PROGRAMS = qqwing
-+qqwing_SOURCES = src/cpp/main.cpp
-+qqwing_LDADD = $(top_builddir)/libqqwing.la
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+dist_pkgconfig_DATA = qqwing.pc
-+
-+dist_man1_MANS = doc/qqwing.man
-diff --git a/build/Makefile.am b/build/Makefile.am
-deleted file mode 100644
-index ef647d2..0000000
---- a/build/Makefile.am
-+++ /dev/null
-@@ -1,17 +0,0 @@
--ACLOCAL_AMFLAGS = -I m4
--EXTRA_DIST = debian
--
--include_HEADERS = qqwing.hpp
--
--lib_LTLIBRARIES = libqqwing.la
--libqqwing_la_SOURCES = qqwing.cpp qqwing.hpp
--libqqwing_la_LDFLAGS = -no-undefined -version-info $(QQWING_CURRENT):$(QQWING_REVISION):$(QQWING_AGE)
--
--bin_PROGRAMS = qqwing
--qqwing_SOURCES = main.cpp
--qqwing_LDADD = $(top_builddir)/libqqwing.la
--
--pkgconfigdir = $(libdir)/pkgconfig
--dist_pkgconfig_DATA = qqwing.pc
--
--dist_man_MANS = qqwing.1
-diff --git a/build/configure.ac b/build/configure.ac
-deleted file mode 100755
-index ca75f59..0000000
---- a/build/configure.ac
-+++ /dev/null
-@@ -1,47 +0,0 @@
--AC_PREREQ(2.59)
--AC_INIT(qqwing, 1.3.3, http://qqwing.com/)
--AC_CONFIG_MACRO_DIR([m4])
--AC_CONFIG_SRCDIR([config.h.in])
--AC_CONFIG_HEADER([config.h])
--
--# Before making a release, the LT_VERSION string should be modified.
--# The string is of the form C:R:A.
--# - If interfaces have been changed or added, but binary compatibility has
--#   been preserved, change to C+1:0:A+1
--# - If binary compatibility has been broken (eg removed or changed interfaces)
--#   change to C+1:0:0
--# - If the interface is the same as the previous version, change to C:R+1:A
--QQWING_CURRENT=2
--QQWING_REVISION=3
--QQWING_AGE=0
--
--AC_SUBST([QQWING_CURRENT])
--AC_SUBST([QQWING_REVISION])
--AC_SUBST([QQWING_AGE])
--
--AM_INIT_AUTOMAKE([foreign])
--
--# Checks for programs.
--AC_PROG_CXX
--AC_PROG_CC
--
--LT_PREREQ([2.2])
--LT_INIT([disable-static])
--
--# Checks for libraries.
--
--# Checks for header files.
--AC_HEADER_STDC
--AC_CHECK_HEADERS([stdlib.h sys/time.h])
--
--# Checks for typedefs, structures, and compiler characteristics.
--AC_HEADER_STDBOOL
--AC_C_CONST
--AC_C_INLINE
--AC_HEADER_TIME
--
--# Checks for library functions.
--AC_CHECK_FUNCS([gettimeofday])
--
--AC_CONFIG_FILES([Makefile qqwing.pc])
--AC_OUTPUT
-diff --git a/build/qqwing.pc.in b/build/qqwing.pc.in
-deleted file mode 100755
-index fcc4c45..0000000
---- a/build/qqwing.pc.in
-+++ /dev/null
-@@ -1,10 +0,0 @@
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--
--Name: libqqwing
--Description: Sudoku generator and solver library
--Version: @VERSION@
--Libs: -L${libdir} -lqqwing
--Cflags: -I${includedir}
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..646494f
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,47 @@
-+AC_PREREQ(2.59)
-+AC_INIT(qqwing, 1.3.3, http://qqwing.com/)
-+AC_CONFIG_MACRO_DIR([m4])
-+AC_CONFIG_SRCDIR([config.h.in])
-+AC_CONFIG_HEADER([config.h])
-+
-+# Before making a release, the LT_VERSION string should be modified.
-+# The string is of the form C:R:A.
-+# - If interfaces have been changed or added, but binary compatibility has
-+#   been preserved, change to C+1:0:A+1
-+# - If binary compatibility has been broken (eg removed or changed interfaces)
-+#   change to C+1:0:0
-+# - If the interface is the same as the previous version, change to C:R+1:A
-+QQWING_CURRENT=2
-+QQWING_REVISION=3
-+QQWING_AGE=0
-+
-+AC_SUBST([QQWING_CURRENT])
-+AC_SUBST([QQWING_REVISION])
-+AC_SUBST([QQWING_AGE])
-+
-+AM_INIT_AUTOMAKE([foreign subdir-objects])
-+
-+# Checks for programs.
-+AC_PROG_CXX
-+AC_PROG_CC
-+
-+LT_PREREQ([2.2])
-+LT_INIT([disable-static])
-+
-+# Checks for libraries.
-+
-+# Checks for header files.
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS([stdlib.h sys/time.h])
-+
-+# Checks for typedefs, structures, and compiler characteristics.
-+AC_HEADER_STDBOOL
-+AC_C_CONST
-+AC_C_INLINE
-+AC_HEADER_TIME
-+
-+# Checks for library functions.
-+AC_CHECK_FUNCS([gettimeofday])
-+
-+AC_CONFIG_FILES([Makefile qqwing.pc])
-+AC_OUTPUT
-diff --git a/qqwing.pc.in b/qqwing.pc.in
-new file mode 100644
-index 0000000..fcc4c45
---- /dev/null
-+++ b/qqwing.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: libqqwing
-+Description: Sudoku generator and solver library
-+Version: @VERSION@
-+Libs: -L${libdir} -lqqwing
-+Cflags: -I${includedir}
--- 
-2.1.2
-
diff --git a/dev-libs/qqwing/qqwing-1.3.3.ebuild b/dev-libs/qqwing/qqwing-1.3.3.ebuild
deleted file mode 100644
index 8755e040c441..000000000000
--- a/dev-libs/qqwing/qqwing-1.3.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch
-
-DESCRIPTION="Sudoku puzzle generator and solver"
-HOMEPAGE="https://qqwing.com"
-SRC_URI="https://github.com/stephenostermiller/${PN}/archive/v${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-src_prepare() {
-	# Make autotools work out of the box
-	epatch "${FILESDIR}"/${PN}-1.3.0-autotools.patch
-
-	eautoreconf
-}
diff --git a/dev-libs/qqwing/qqwing-1.3.4.ebuild b/dev-libs/qqwing/qqwing-1.3.4.ebuild
index 02c5bd8cc293..8fa1cf43c1b0 100644
--- a/dev-libs/qqwing/qqwing-1.3.4.ebuild
+++ b/dev-libs/qqwing/qqwing-1.3.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="Sudoku puzzle generator and solver"
 HOMEPAGE="https://qqwing.com"