[gentoo-commits] repo/gentoo:master commit in: dev-lang/srf/, dev-lang/srf/files/

2020-11-28 Thread David Seifert
commit: cbbaf8e8744ecbfad9ee7159d00ea7d589e1de0f
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:08:49 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:08:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbbaf8e8

dev-lang/srf: fix build with gcc-10

Closes: https://bugs.gentoo.org/712054
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-lang/srf/files/srf-1.0-fno-common.patch | 8 
 dev-lang/srf/srf-1.0-r2.ebuild  | 9 -
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/dev-lang/srf/files/srf-1.0-fno-common.patch 
b/dev-lang/srf/files/srf-1.0-fno-common.patch
new file mode 100644
index 000..abbd5c74191
--- /dev/null
+++ b/dev-lang/srf/files/srf-1.0-fno-common.patch
@@ -0,0 +1,8 @@
+--- a/builtins.h
 b/builtins.h
+@@ -20,4 +20,4 @@
+ */
+ #ident "$Id: builtins.h,v 1.4 2004/11/02 04:39:39 bediger Exp $"
+ void setup_builtins(void);
+-int primitive_call_counter;
++extern int primitive_call_counter;

diff --git a/dev-lang/srf/srf-1.0-r2.ebuild b/dev-lang/srf/srf-1.0-r2.ebuild
index 75e62c66f6f..949fee4692d 100644
--- a/dev-lang/srf/srf-1.0-r2.ebuild
+++ b/dev-lang/srf/srf-1.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils vcs-clean
+inherit vcs-clean
 
 DESCRIPTION="The Simple Recursive Functions programming language"
 HOMEPAGE="http://www.stratigery.com/srf.html;
@@ -12,12 +12,12 @@ SRC_URI="http://www.stratigery.com/srf.html/${P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
 
 DEPEND="
sys-devel/flex
virtual/yacc"
-RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_prepare() {
default
@@ -30,6 +30,5 @@ src_install() {
doman srf.1
dodoc README srf.html
 
-   docinto examples
-   dodoc examples/*
+   dodoc -r examples
 }



[gentoo-commits] repo/gentoo:master commit in: x11-terms/mrxvt/, x11-terms/mrxvt/files/

2020-11-28 Thread David Seifert
commit: d3e99bee31a1948abb61d68092d0da987d967e9e
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:09:24 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:09:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e99bee

x11-terms/mrxvt: fix build with gcc-10

* Thanks to Sam James for providing the patch link

Closes: https://github.com/gentoo/gentoo/pull/18441
Closes: https://bugs.gentoo.org/707146
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch | 20 +++
 x11-terms/mrxvt/mrxvt-0.5.4.ebuild | 41 +-
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch 
b/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch
new file mode 100644
index 000..2bb39a423ae
--- /dev/null
+++ b/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/src/rxvtlib.h
 b/src/rxvtlib.h
+@@ -790,7 +790,7 @@ typedef struct {
+ } action_t;
+ 
+ /* Values for macro_t.type. Must sync this with macroNames from macros.c */
+-enum {
++enum macroFnNames {
+ MacroFnDummy=0,
+ MacroFnEsc,
+ MacroFnStr,
+@@ -820,7 +820,7 @@ enum {
+ MacroFnSaveConfig,
+ MacroFnToggleMacros,
+ NMACRO_FUNCS
+-} macroFnNames;
++};
+ 
+ typedef unsigned char macro_priority_t;
+ typedef struct {

diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild 
b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
index 2090e188130..dbbfd4f073d 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils
+
+inherit autotools
 
 DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK 
support"
 HOMEPAGE="http://materm.sourceforge.net/;
@@ -15,31 +16,37 @@ KEYWORDS="~alpha amd64 ~arm64 ~mips ppc x86 ~amd64-linux 
~x86-linux ~ppc-macos"
 L10N_IUSE="l10n_el l10n_ja l10n_ko l10n_th l10n_zh-CN l10n_zh-TW"
 IUSE="debug png jpeg session truetype menubar utempter xpm ${L10N_IUSE}"
 
-RDEPEND="png? ( media-libs/libpng )
-   utempter? ( sys-libs/libutempter )
+RDEPEND="
+   x11-libs/libX11
+   x11-libs/libXrender
+   x11-libs/libXt
jpeg? ( virtual/jpeg )
-   truetype? ( x11-libs/libXft
+   png? ( media-libs/libpng:= )
+   truetype? (
media-libs/fontconfig
media-libs/freetype
-   elibc_uclibc? ( dev-libs/libiconv ) )
-   x11-libs/libX11
-   x11-libs/libXt
-   xpm? ( x11-libs/libXpm )
-   x11-libs/libXrender"
-
-DEPEND="${RDEPEND}
+   x11-libs/libXft
+   elibc_uclibc? ( dev-libs/libiconv )
+   )
+   utempter? ( sys-libs/libutempter )
+   xpm? ( x11-libs/libXpm )"
+DEPEND="
+   ${RDEPEND}
x11-base/xorg-proto"
 
-src_prepare() {
-   eapply "${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch
-   eapply "${FILESDIR}"/${P}-libpng14.patch
-   eapply_user
+PATCHES=(
+   "${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch
+   "${FILESDIR}"/${P}-libpng14.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+)
 
+src_prepare() {
+   default
eautoreconf
 
if use elibc_uclibc && use truetype; then
# It is stated in the README "Multichar support under XFT 
requires GNU iconv"
-   sed -i -e 's/LIBS = @LIBS@/LIBS = @LIBS@ -liconv/' 
"${S}/src/Makefile.in"
+   sed -i -e 's/LIBS = @LIBS@/LIBS = @LIBS@ -liconv/' 
src/Makefile.in || die
fi
 }
 
@@ -102,7 +109,7 @@ src_install() {
 }
 
 pkg_postinst() {
-   if [[ -z $RXVT_TERM ]]; then
+   if [[ -z ${RXVT_TERM} ]]; then
einfo
einfo "If you experience problems with curses programs, then 
this is"
einfo "most likely because of incorrectly set termcap / 
terminfo"



[gentoo-commits] repo/gentoo:master commit in: www-servers/sniproxy/files/, www-servers/sniproxy/

2020-11-28 Thread David Seifert
commit: 4b9142d25d28c969e823177916b5319a8f808a7b
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:09:21 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:09:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b9142d2

www-servers/sniproxy: fix build with gcc-10, port to GLEP 81

Closes: https://bugs.gentoo.org/707530
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 .../sniproxy/files/sniproxy-0.6.0-fno-common.patch | 24 +++
 ...proxy-0.6.0.ebuild => sniproxy-0.6.0-r1.ebuild} | 36 +-
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/www-servers/sniproxy/files/sniproxy-0.6.0-fno-common.patch 
b/www-servers/sniproxy/files/sniproxy-0.6.0-fno-common.patch
new file mode 100644
index 000..f718bfca736
--- /dev/null
+++ b/www-servers/sniproxy/files/sniproxy-0.6.0-fno-common.patch
@@ -0,0 +1,24 @@
+Taken from: 
https://github.com/dlundquist/sniproxy/commit/822bb80df9b7b345cc9eba55df74a07b498819ba
+Author: Pierre-Olivier Mercier 
+
+--- a/src/http.h
 b/src/http.h
+@@ -29,6 +29,6 @@
+ #include 
+ #include "protocol.h"
+ 
+-const struct Protocol *const http_protocol;
++extern const struct Protocol *const http_protocol;
+ 
+ #endif
+--- a/src/tls.h
 b/src/tls.h
+@@ -28,6 +28,6 @@
+ 
+ #include "protocol.h"
+ 
+-const struct Protocol *const tls_protocol;
++extern const struct Protocol *const tls_protocol;
+ 
+ #endif
+

diff --git a/www-servers/sniproxy/sniproxy-0.6.0.ebuild 
b/www-servers/sniproxy/sniproxy-0.6.0-r1.ebuild
similarity index 82%
rename from www-servers/sniproxy/sniproxy-0.6.0.ebuild
rename to www-servers/sniproxy/sniproxy-0.6.0-r1.ebuild
index 458f1e8ac79..9dc8e5a03ef 100644
--- a/www-servers/sniproxy/sniproxy-0.6.0.ebuild
+++ b/www-servers/sniproxy/sniproxy-0.6.0-r1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools user
+inherit autotools
 
-if [[ ${PV} == * ]]; then
+if [[ ${PV} == * ]]; then
EGIT_REPO_URI="https://github.com/dlundquist/sniproxy.git;
EGIT_BRANCH="master"
inherit git-r3
-   KEYWORDS=""
 else
SRC_URI="https://github.com/dlundquist/sniproxy/archive/${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
@@ -24,18 +23,18 @@ IUSE="+dns +largefile rfc3339 test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+   acct-group/sniproxy
+   acct-user/sniproxy
dev-libs/libev
>=dev-libs/libpcre-3
-   dns? ( net-libs/udns )
-"
+   dns? ( net-libs/udns )"
+DEPEND="${RDEPEND}
+   test? ( net-misc/curl )"
 BDEPEND="
-   ${RDEPEND}
sys-devel/gettext
-   virtual/pkgconfig
-"
-DEPEND="
-   test? ( net-misc/curl )
-"
+   virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_prepare() {
default
@@ -55,6 +54,10 @@ src_configure() {
econf "${my_conf[@]}"
 }
 
+src_test() {
+   emake -j1 check
+}
+
 src_install() {
default
 
@@ -72,12 +75,3 @@ src_install() {
doman man/sniproxy.8
doman man/sniproxy.conf.5
 }
-
-src_test() {
-   emake -j1 check
-}
-
-pkg_postinst() {
-   enewgroup "${PN}"
-   enewuser "${PN}" -1 -1 /var/lib/sniproxy "${PN}"
-}



[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/

2020-11-28 Thread David Seifert
commit: a45dfd34d2a5ccb5a07a968a475b656b743f992e
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:08:46 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:08:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a45dfd34

app-i18n/uim: fix build with gcc-10

* Thanks to Jeroen Roovers for submitting the patch

Closes: https://bugs.gentoo.org/706968
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 app-i18n/uim/files/uim-1.8.8-fno-common.patch | 11 +++
 app-i18n/uim/uim-1.8.8.ebuild |  1 +
 2 files changed, 12 insertions(+)

diff --git a/app-i18n/uim/files/uim-1.8.8-fno-common.patch 
b/app-i18n/uim/files/uim-1.8.8-fno-common.patch
new file mode 100644
index 000..ff974bb5d5b
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.8-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/sigscheme/libgcroots/include/private/gc_priv.h
 b/sigscheme/libgcroots/include/private/gc_priv.h
+@@ -1979,7 +1979,7 @@
+   /* the signal mask. */
+ # define SETJMP(env) sigsetjmp(env, 1)
+ # define LONGJMP(env, val) siglongjmp(env, val)
+-# define JMP_BUF sigjmp_buf
++# define JMP_BUF extern sigjmp_buf
+ #else
+ # ifdef ECOS
+ #   define SETJMP(env)  hal_setjmp(env)

diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
index 412b439ce31..3ed23be0370 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -84,6 +84,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-tinfo.patch
"${FILESDIR}"/${PN}-xkb.patch
"${FILESDIR}"/${PN}-zh-TW.patch
+   "${FILESDIR}"/${P}-fno-common.patch
 )
 DOCS=( AUTHORS NEWS README RELNOTE doc )
 



[gentoo-commits] repo/gentoo:master commit in: sys-fabric/infinipath-psm/, sys-fabric/infinipath-psm/files/

2020-11-28 Thread David Seifert
commit: ac8f2fc430322b1a6caa125e93cac120da24db62
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:09:18 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:09:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac8f2fc4

sys-fabric/infinipath-psm: fix build with gcc-10

* Thanks to Sam James for providing the patch link

Closes: https://bugs.gentoo.org/706398
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 .../files/infinipath-psm-3.2-fno-common.patch  | 79 ++
 .../infinipath-psm/infinipath-psm-3.2.ebuild   |  6 +-
 2 files changed, 82 insertions(+), 3 deletions(-)

diff --git 
a/sys-fabric/infinipath-psm/files/infinipath-psm-3.2-fno-common.patch 
b/sys-fabric/infinipath-psm/files/infinipath-psm-3.2-fno-common.patch
new file mode 100644
index 000..7f376f009e7
--- /dev/null
+++ b/sys-fabric/infinipath-psm/files/infinipath-psm-3.2-fno-common.patch
@@ -0,0 +1,79 @@
+Taken From: 
https://build.opensuse.org/package/view_file/science:HPC:Head/infinipath-psm/Add-missing-extern-keywords.patch?expand=1
+Author: Nicolas Morey-Chaisemartin 
+
+--- psm_error.h
 psm_error.h
+@@ -42,7 +42,7 @@
+ #define PSMI_EP_NORETURN  ((psm_ep_t) -2)
+ #define PSMI_EP_LOGEVENT  ((psm_ep_t) -3)
+ 
+-psm_ep_errhandler_t psmi_errhandler_global;
++extern psm_ep_errhandler_t psmi_errhandler_global;
+ 
+ psm_error_t psmi_handle_error(psm_ep_t ep, psm_error_t error, 
+ const char *buf, ...)
+--- psm_user.h
 psm_user.h
+@@ -100,7 +100,7 @@ psm_error_t psmi_mq_wait_internal(psm_mq_req_t *ireq);
+ #endif
+ 
+ #ifdef PSMI_PLOCK_IS_SPINLOCK
+-  psmi_spinlock_t  psmi_progress_lock;
++  extern psmi_spinlock_t  psmi_progress_lock;
+   #define PSMI_PLOCK_INIT()   psmi_spin_init(_progress_lock)
+   #define PSMI_PLOCK_TRY()psmi_spin_trylock(_progress_lock)
+   #define PSMI_PLOCK()  psmi_spin_lock(_progress_lock)
+@@ -109,8 +109,8 @@ psm_error_t psmi_mq_wait_internal(psm_mq_req_t *ireq);
+   #define PSMI_PUNLOCK_ASSERT()
+   #define PSMI_PLOCK_DISABLED  0
+ #elif defined(PSMI_PLOCK_IS_MUTEXLOCK_DEBUG) 
+-  pthread_mutex_t  psmi_progress_lock;
+-  pthread_t  psmi_progress_lock_owner;
++  extern pthread_mutex_t  psmi_progress_lock;
++  extern pthread_t   psmi_progress_lock_owner;
+   #define PSMI_PLOCK_NO_OWNER ((pthread_t)(-1))
+ 
+   PSMI_ALWAYS_INLINE(
+--- psm_utils.h
 psm_utils.h
+@@ -254,7 +254,7 @@ intpsmi_diags(void);
+  * Fault injection
+  */
+ struct psmi_faultinj_spec;
+-intpsmi_faultinj_enabled; /* use macro to test */
++extern intpsmi_faultinj_enabled; /* use macro to test */
+ #if 1 /* possible to disable at compile time */
+ #define PSMI_FAULTINJ_ENABLED()   (!!psmi_faultinj_enabled)
+ #else
+--- ptl_am/ptl_fwd.h
 ptl_am/ptl_fwd.h
+@@ -47,7 +47,7 @@
+ #endif
+ 
+ /* Symbol in am ptl */
+-struct ptl_ctl_init psmi_ptl_amsh;
++extern struct ptl_ctl_init psmi_ptl_amsh;
+ 
+ /* Special non-ptl function exposed to pre-attach to shm segment */
+ psm_error_t psmi_shm_attach(psm_ep_t ep, int *shmidx_o);
+--- ptl_ips/ptl_fwd.h
 ptl_ips/ptl_fwd.h
+@@ -38,5 +38,5 @@
+ typedef struct ptl_epaddr ips_epaddr_t;
+ 
+ /* Symbol in ips ptl */
+-struct ptl_ctl_init psmi_ptl_ips;
++extern struct ptl_ctl_init psmi_ptl_ips;
+ #endif /* _PTL_FWD_IPS_H */
+--- ptl_self/ptl_fwd.h
 ptl_self/ptl_fwd.h
+@@ -35,7 +35,7 @@
+ #define _PTL_FWD_SELF_H
+ 
+ /* Symbol in am ptl */
+-struct ptl_ctl_init psmi_ptl_self;
++extern struct ptl_ctl_init psmi_ptl_self;
+ 
+ #endif
+ 
+

diff --git a/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild 
b/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
index 0654f652690..3df69cc34f9 100644
--- a/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
+++ b/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,11 +10,10 @@ OFED_SUFFIX="2_ga8c3e3e_open"
 OFED_SNAPSHOT="1"
 OFED_SRC_SNAPSHOT="1"
 
-inherit openib udev
+inherit epatch openib udev
 
 DESCRIPTION="OpenIB userspace driver for the PathScale InfiniBand HCAs"
 KEYWORDS="amd64 ~x86 ~amd64-linux"
-IUSE=""
 
 RDEPEND="sys-fabric/libibverbs:${SLOT}"
 DEPEND="${RDEPEND}
@@ -26,6 +25,7 @@ src_prepare() {
sed -e 's:uname -p:uname -m:g' \
-e 's:-Werror::g' \
-i buildflags.mak || die
+   epatch "${FILESDIR}"/${P}-fno-common.patch
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: sci-calculators/hcalc/files/, sci-calculators/hcalc/

2020-11-28 Thread David Seifert
commit: 2a1d01a2d1aff43310a0bf5337fcfffdaef00914
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:09:09 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:09:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a1d01a2

sci-calculators/hcalc: port to EAPI 7

* Thanks to Jeroen Roovers for submitting the patch.

Closes: https://bugs.gentoo.org/709722
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch | 13 +
 sci-calculators/hcalc/hcalc-1.2-r1.ebuild  |  9 +
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch 
b/sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch
new file mode 100644
index 000..b8bdcc73e30
--- /dev/null
+++ b/sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch
@@ -0,0 +1,13 @@
+--- a/hcalc.h
 b/hcalc.h
+@@ -25,8 +25,8 @@
+ extern Pixmap face;
+ extern Pixmap chars;
+ 
+-int bit_on;
+-int bit_off;
++extern int bit_on;
++extern int bit_off;
+ 
+ extern int char_to_x[256];
+ extern char charmap[];

diff --git a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild 
b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
index bbd0de3fcfa..6a6b90666a0 100644
--- a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
+++ b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="DJ's Hex Calculator"
 HOMEPAGE="http://www.delorie.com/store/hcalc/ https://github.com/jlec/hcalc;
@@ -12,13 +12,14 @@ 
SRC_URI="https://github.com/downloads/jlec/hcalc/${P}.tar.xz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="
x11-libs/libX11
x11-libs/libXpm"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 pkg_postinst() {
einfo "Enter hcalc to run and use kill or ctrl-c to exit."
 }



[gentoo-commits] repo/gentoo:master commit in: sci-electronics/xoscope/, sci-electronics/xoscope/files/

2020-11-28 Thread David Seifert
commit: 0bb5bd126a41aeb8418016ad852d8d9c823ac311
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:09:12 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:09:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bb5bd12

sci-electronics/xoscope: bump to 2.2

* Thanks to Sam James for providing the patch link

Closes: https://bugs.gentoo.org/707154
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-electronics/xoscope/Manifest   |  1 +
 .../xoscope/files/xoscope-2.2-fno-common.patch | 16 ++
 .../xoscope/files/xoscope-2.2-man_no_-Tutf8.patch  | 11 +++
 sci-electronics/xoscope/xoscope-2.2.ebuild | 34 ++
 4 files changed, 62 insertions(+)

diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest
index fdab31110f0..1d4cc20517a 100644
--- a/sci-electronics/xoscope/Manifest
+++ b/sci-electronics/xoscope/Manifest
@@ -1,2 +1,3 @@
 DIST xoscope-2.0.tgz 334875 BLAKE2B 
67d3058e822ee4d2a410f92be4ec397381d66150be636bcb799eb13f20326aff0075ab5e1067d2f72a9fe30eda3584228f3ea637aa649554c6f43261a24717e7
 SHA512 
8a7506dd40133c1bfaf101102f84a5d81712b4cc28d75002f14d5c5b2e08162813dfb68a3e15e1056545d225d563c66ac8a5a81deede3c93a5bb943b81c8fc70
 DIST xoscope-2.1.tar.gz 302170 BLAKE2B 
afd706d51fe2b63f5e948d9dafd56a16eb9368717536514f1e734909a758e585893101b0dd381ff3d45da958212f35ea76b44f4689d3242cc731cb7371913d03
 SHA512 
2ecc75d04d36634d83b7c6636dc7e45fb068ae37e0ee1b0e97c65f9cd56f7fe0e511828821fa0ca2cfe4c6cd6a05e8d23275ec96253dc6faec91db4cbdecd13d
+DIST xoscope-2.2.tar.gz 307319 BLAKE2B 
860fe234e5958a005ff0cff5143fcc0711d69b958e2f6277589d08074001872b065ecb435493285231ff0c61aea1b50b221aa36127b25947184e059e951a70ec
 SHA512 
77a1d7d673af3d82e5a3d563d6901c3d6f5a16a1d889e9b95ac2d7d10c8036461a94fb841266b6d131e96303d4fce47b4bc8255b3855690e9148ead6c38b74cd

diff --git a/sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch 
b/sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch
new file mode 100644
index 000..124a8fdd767
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch
@@ -0,0 +1,16 @@
+Description: Fix FTBFS with GCC 10
+Bug-Debian: https://bugs.debian.org/957990
+Forwarded: 
https://sourceforge.net/p/xoscope/discussion/23485/thread/d6fba12f59/
+Author: Raymundo Cassani 
+Last-Update: 2020-05-20
+
+--- a/display.c
 b/display.c
+@@ -35,7 +35,6 @@
+ #define DEBUG 0
+ 
+ int triggered = 0;  /* whether we've triggered or not */
+-void*font;
+ int math_warning = 0;   /* TRUE if math has a problem */
+ 
+ struct signal_stats stats;

diff --git a/sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch 
b/sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch
new file mode 100644
index 000..a0f54eb26e3
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
 b/configure.ac
+@@ -132,7 +132,7 @@ AC_DEFINE(CHANNELS, 8, [max number of channels])
+ 
+ AC_DEFINE(MSECREFRESH, 30, [minimum number of milliseconds between refresh on 
libsx version])
+ 
+-AC_DEFINE(HELPCOMMAND, "man -Tutf8 xoscope 2>&1", [shell command for X11 
help])
++AC_DEFINE(HELPCOMMAND, "man xoscope 2>&1", [shell command for X11 help])
+ 
+ AC_DEFINE(FILENAME, "oscope.dat", [default file name])
+ 

diff --git a/sci-electronics/xoscope/xoscope-2.2.ebuild 
b/sci-electronics/xoscope/xoscope-2.2.ebuild
new file mode 100644
index 000..a51858f54bd
--- /dev/null
+++ b/sci-electronics/xoscope/xoscope-2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+DESCRIPTION="Soundcard Oscilloscope for X"
+HOMEPAGE="http://xoscope.sourceforge.net;
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   sci-libs/fftw:3.0=
+   virtual/man
+   x11-libs/gtkdatabox"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~!SND_PCM_OSS"
+ERROR_SND_PCM_OSS="CONFIG_SND_PCM_OSS is needed to support sound card input 
via /dev/dsp"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-man_no_-Tutf8.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}



[gentoo-commits] repo/gentoo:master commit in: sci-electronics/xoscope/

2020-11-28 Thread David Seifert
commit: 78fc0d72b6ac1d148f1523a12a6d0c35bc1aa3fd
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:09:15 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:09:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78fc0d72

sci-electronics/xoscope: remove old

Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-electronics/xoscope/Manifest   |  1 -
 sci-electronics/xoscope/xoscope-2.1.ebuild | 29 -
 2 files changed, 30 deletions(-)

diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest
index 1d4cc20517a..b07f4632bea 100644
--- a/sci-electronics/xoscope/Manifest
+++ b/sci-electronics/xoscope/Manifest
@@ -1,3 +1,2 @@
 DIST xoscope-2.0.tgz 334875 BLAKE2B 
67d3058e822ee4d2a410f92be4ec397381d66150be636bcb799eb13f20326aff0075ab5e1067d2f72a9fe30eda3584228f3ea637aa649554c6f43261a24717e7
 SHA512 
8a7506dd40133c1bfaf101102f84a5d81712b4cc28d75002f14d5c5b2e08162813dfb68a3e15e1056545d225d563c66ac8a5a81deede3c93a5bb943b81c8fc70
-DIST xoscope-2.1.tar.gz 302170 BLAKE2B 
afd706d51fe2b63f5e948d9dafd56a16eb9368717536514f1e734909a758e585893101b0dd381ff3d45da958212f35ea76b44f4689d3242cc731cb7371913d03
 SHA512 
2ecc75d04d36634d83b7c6636dc7e45fb068ae37e0ee1b0e97c65f9cd56f7fe0e511828821fa0ca2cfe4c6cd6a05e8d23275ec96253dc6faec91db4cbdecd13d
 DIST xoscope-2.2.tar.gz 307319 BLAKE2B 
860fe234e5958a005ff0cff5143fcc0711d69b958e2f6277589d08074001872b065ecb435493285231ff0c61aea1b50b221aa36127b25947184e059e951a70ec
 SHA512 
77a1d7d673af3d82e5a3d563d6901c3d6f5a16a1d889e9b95ac2d7d10c8036461a94fb841266b6d131e96303d4fce47b4bc8255b3855690e9148ead6c38b74cd

diff --git a/sci-electronics/xoscope/xoscope-2.1.ebuild 
b/sci-electronics/xoscope/xoscope-2.1.ebuild
deleted file mode 100644
index 5b730bc12bc..000
--- a/sci-electronics/xoscope/xoscope-2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils linux-info
-
-DESCRIPTION="Soundcard Oscilloscope for X"
-HOMEPAGE="http://xoscope.sourceforge.net;
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtkdatabox
-   virtual/man"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-CONFIG_CHECK="~!SND_PCM_OSS"
-ERROR_SND_PCM_OSS="CONFIG_SND_PCM_OSS is needed to support sound card input 
via /dev/dsp"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-man_no_-Tutf8.patch
-
-   eautoreconf
-}



[gentoo-commits] repo/gentoo:master commit in: net-misc/usbip/

2020-11-28 Thread David Seifert
commit: f62465507f9cd0eb8529a52993f56253082b4f76
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 28 23:09:00 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:09:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6246550

net-misc/usbip: Remove old

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 net-misc/usbip/Manifest  |  1 -
 net-misc/usbip/usbip-3.19.ebuild | 52 
 2 files changed, 53 deletions(-)

diff --git a/net-misc/usbip/Manifest b/net-misc/usbip/Manifest
index 97320827018..a25d0457052 100644
--- a/net-misc/usbip/Manifest
+++ b/net-misc/usbip/Manifest
@@ -1,2 +1 @@
-DIST linux-3.19.tar.xz 81688872 BLAKE2B 
0b89e34e62d6fe42f43144fe4f3070df2d9a23831b231918946c1f19a1a4b881095892635983ac7afad902f366b0c6001e46751ed2c96890ecbe9d4056154be6
 SHA512 
d77bfd9b1cd524ac50bb5a93808955be2f9bcd2ec0badcc8aa6a63401e212f891fd14bd27c6441174ba5d70ab875b9e76c7ebc95f046e31aff1d40790d30351c
 DIST linux-4.13.tar.xz 100579888 BLAKE2B 
2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b
 SHA512 
a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2

diff --git a/net-misc/usbip/usbip-3.19.ebuild b/net-misc/usbip/usbip-3.19.ebuild
deleted file mode 100644
index dd1e0ccb381..000
--- a/net-misc/usbip/usbip-3.19.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ETYPE="sources"
-K_NOUSENAME=1
-inherit autotools eutils kernel-2 ltprune
-
-DESCRIPTION="Userspace utilities for a general USB device sharing system over 
IP networks"
-HOMEPAGE="https://www.kernel.org/;
-SRC_URI="${KERNEL_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs tcpd"
-RESTRICT=""
-
-RDEPEND=">=dev-libs/glib-2.6
-   sys-apps/hwids
-   >=sys-kernel/linux-headers-3.17
-   virtual/libudev
-   tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-DOCS="AUTHORS README ../../../drivers/usb/usbip/usbip_protocol.txt"
-
-S=${WORKDIR}/linux-${PV}/tools/usb/${PN}
-
-src_prepare() {
-   # remove -Werror from build, bug #545398
-   sed -i 's/-Werror[^ ]* //g' configure.ac || die
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable static-libs static) \
-   $(use tcpd || echo --without-tcp-wrappers) \
-   --with-usbids-dir=/usr/share/misc
-}
-
-src_install() {
-   default
-   prune_libtool_files
-}
-
-pkg_postinst() {
-   elog "For using USB/IP you need to enable USBIP_VHCI_HCD in the client"
-   elog "machine's kernel config and USBIP_HOST on the server."
-}



[gentoo-commits] repo/gentoo:master commit in: net-proxy/ziproxy/files/, net-proxy/ziproxy/

2020-11-28 Thread David Seifert
commit: 2b8e5c1029efa149b3b9b6ee4796a04931f3ab27
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:09:06 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:09:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8e5c10

net-proxy/ziproxy: port to EAPI 7 and GLEP 81

Closes: https://bugs.gentoo.org/707626
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 .../ziproxy/files/ziproxy-3.3.1-fno-common.patch  | 19 +++
 ...iproxy-3.3.1-r1.ebuild => ziproxy-3.3.1-r2.ebuild} | 19 +--
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/net-proxy/ziproxy/files/ziproxy-3.3.1-fno-common.patch 
b/net-proxy/ziproxy/files/ziproxy-3.3.1-fno-common.patch
new file mode 100644
index 000..5b6735c5d88
--- /dev/null
+++ b/net-proxy/ziproxy/files/ziproxy-3.3.1-fno-common.patch
@@ -0,0 +1,19 @@
+--- a/src/tosmarking.c  2020-05-21 14:56:31.09500 +0900
 b/src/tosmarking.c  2020-05-21 14:58:11.72000 +0900
+@@ -36,11 +36,11 @@
+ /* private, local. those are not the same as the vars with the same name */
+ int tosmarking_enabled;
+ SOCKET sock_child_out;
+-int TOSFlagsDefault;
+-int TOSFlagsDiff;
+-const t_ut_urltable *tos_markasdiff_url;
+-const t_ct_cttable *tos_maskasdiff_ct;
+-ZP_DATASIZE_TYPE TOSMarkAsDiffSizeBT;
++extern int TOSFlagsDefault;
++extern int TOSFlagsDiff;
++extern const t_ut_urltable *tos_markasdiff_url;
++extern const t_ct_cttable *tos_maskasdiff_ct;
++extern ZP_DATASIZE_TYPE TOSMarkAsDiffSizeBT;
+
+ int current_tos;
+ ZP_DATASIZE_TYPE tos_bytecount;/* counter used by TOSMarkAsDiffSizeBT 
*/

diff --git a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild 
b/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
similarity index 86%
rename from net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
rename to net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
index b5d92bd3fad..ee73d8bdc66 100644
--- a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
+++ b/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit user
+EAPI=7
 
 DESCRIPTION="A forwarding, non-caching, compressing web proxy server"
 HOMEPAGE="http://ziproxy.sourceforge.net/;
@@ -14,6 +13,8 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="sasl xinetd"
 
 RDEPEND="
+   acct-group/ziproxy
+   acct-user/ziproxy
media-libs/giflib:0=
media-libs/libpng:0=
virtual/jpeg:0
@@ -23,12 +24,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-giflib5.patch )
-
-pkg_setup() {
-   enewgroup ziproxy
-   enewuser ziproxy -1 -1 -1 ziproxy
-}
+PATCHES=(
+   "${FILESDIR}"/${P}-giflib5.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
default
@@ -58,7 +57,7 @@ src_install() {
default
 
dodir /usr/sbin
-   mv -vf "${D}"usr/{,s}bin/ziproxy || die
+   mv -vf "${ED}"/usr/{,s}bin/ziproxy || die
 
dobin src/tools/ziproxy_genhtml_stats.sh
 



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/sigscheme/, dev-scheme/sigscheme/files/

2020-11-28 Thread David Seifert
commit: 5cd5bc929649189c6210696825db557956f9d11e
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:08:51 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:08:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cd5bc92

dev-scheme/sigscheme: port to EAPI 7

* Thanks to Jeroen Roovers for submitting the patch

Closes: https://bugs.gentoo.org/706906
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 .../sigscheme/files/sigscheme-0.8.5-fno-common.patch   | 11 +++
 dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild | 14 ++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/dev-scheme/sigscheme/files/sigscheme-0.8.5-fno-common.patch 
b/dev-scheme/sigscheme/files/sigscheme-0.8.5-fno-common.patch
new file mode 100644
index 000..efac2648a28
--- /dev/null
+++ b/dev-scheme/sigscheme/files/sigscheme-0.8.5-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/libgcroots/include/private/gc_priv.h
 b/libgcroots/include/private/gc_priv.h
+@@ -1979,7 +1979,7 @@
+   /* the signal mask. */
+ # define SETJMP(env) sigsetjmp(env, 1)
+ # define LONGJMP(env, val) siglongjmp(env, val)
+-# define JMP_BUF sigjmp_buf
++# define JMP_BUF extern sigjmp_buf
+ #else
+ # ifdef ECOS
+ #   define SETJMP(env)  hal_setjmp(env)

diff --git a/dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild 
b/dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild
index cbed33d141c..a154c41664d 100644
--- a/dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild
+++ b/dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="SigScheme is an R5RS Scheme interpreter for embedded use"
 HOMEPAGE="https://code.google.com/p/sigscheme/;
@@ -10,8 +10,14 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2;
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_configure() {
-   econf --enable-hygienic-macro
+   econf --enable-hygienic-macro --disable-static
+}
+
+src_install() {
+   default
+   find "${ED}" -name '*.la' -delete || die
 }



[gentoo-commits] repo/gentoo:master commit in: net-misc/usbip/, net-misc/usbip/files/

2020-11-28 Thread David Seifert
commit: 312fbb322f44b3023a33e93f7c5a2eda32636a5c
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:08:57 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:08:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=312fbb32

net-misc/usbip: fix build with gcc-10

* Unconditionally disable static-libs
* Thanks to Jeroen Roovers for submitting the patch

Closes: https://bugs.gentoo.org/707222
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 net-misc/usbip/files/usbip-4.13-fno-common.patch   | 44 ++
 .../{usbip-4.13.ebuild => usbip-4.13-r1.ebuild}| 22 +--
 2 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/net-misc/usbip/files/usbip-4.13-fno-common.patch 
b/net-misc/usbip/files/usbip-4.13-fno-common.patch
new file mode 100644
index 000..b8ffc40c4b9
--- /dev/null
+++ b/net-misc/usbip/files/usbip-4.13-fno-common.patch
@@ -0,0 +1,44 @@
+--- a/libsrc/usbip_common.c
 b/libsrc/usbip_common.c
+@@ -14,7 +14,7 @@
+ int usbip_use_stderr;
+ int usbip_use_debug;
+ 
+-extern struct udev *udev_context;
++struct udev *udev_context;
+ 
+ struct speed_string {
+   int num;
+--- alibsrc/usbip_common.h
 b/libsrc/usbip_common.h
+@@ -53,6 +53,8 @@
+ #define ST_NODEV  0x04
+ #define ST_ERROR  0x05
+ 
++extern struct udev *udev_context;
++
+ extern int usbip_use_syslog;
+ extern int usbip_use_stderr;
+ extern int usbip_use_debug ;
+--- a/libsrc/usbip_host_common.c
 b/libsrc/usbip_host_common.c
+@@ -23,8 +23,6 @@
+ #include "list.h"
+ #include "sysfs_utils.h"
+ 
+-struct udev *udev_context;
+-
+ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)
+ {
+   char status_attr_path[SYSFS_PATH_MAX];
+--- a/libsrc/vhci_driver.c
 b/libsrc/vhci_driver.c
+@@ -15,7 +15,6 @@
+ #define PROGNAME "libusbip"
+ 
+ struct usbip_vhci_driver *vhci_driver;
+-struct udev *udev_context;
+ 
+ static struct usbip_imported_device *
+ imported_device_init(struct usbip_imported_device *idev, char *busid)
+

diff --git a/net-misc/usbip/usbip-4.13.ebuild 
b/net-misc/usbip/usbip-4.13-r1.ebuild
similarity index 77%
rename from net-misc/usbip/usbip-4.13.ebuild
rename to net-misc/usbip/usbip-4.13-r1.ebuild
index bfb8473198b..453bd87fa8f 100644
--- a/net-misc/usbip/usbip-4.13.ebuild
+++ b/net-misc/usbip/usbip-4.13-r1.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 ETYPE="sources"
 K_NOUSENAME=1
-inherit autotools eutils kernel-2 ltprune
+inherit autotools kernel-2
 
 DESCRIPTION="Userspace utilities for a general USB device sharing system over 
IP networks"
 HOMEPAGE="https://www.kernel.org/;
@@ -13,10 +14,10 @@ SRC_URI="${KERNEL_URI}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs tcpd"
-RESTRICT=""
+IUSE="tcpd"
 
-RDEPEND=">=dev-libs/glib-2.6
+RDEPEND="
+   >=dev-libs/glib-2.6
sys-apps/hwids
>=sys-kernel/linux-headers-3.17
virtual/libudev
@@ -24,33 +25,32 @@ RDEPEND=">=dev-libs/glib-2.6
 DEPEND="${RDEPEND}
virtual/pkgconfig"
 
-DOCS="AUTHORS README"
+S="${WORKDIR}/linux-${PV}/tools/usb/${PN}"
 
-S=${WORKDIR}/linux-${PV}/tools/usb/${PN}
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_unpack() {
tar xJf "${DISTDIR}"/${A} linux-${PV}/tools/usb/${PN} || die
 }
 
 src_prepare() {
+   default
# remove -Werror from build, bug #545398
sed -i 's/-Werror[^ ]* //g' configure.ac || die
 
-   default
-
eautoreconf
 }
 
 src_configure() {
econf \
-   $(use_enable static-libs static) \
+   --disable-static \
$(use tcpd || echo --without-tcp-wrappers) \
-   --with-usbids-dir=/usr/share/misc
+   --with-usbids-dir="${EPREFIX}"/usr/share/misc
 }
 
 src_install() {
default
-   prune_libtool_files
+   find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: net-print/c2esp/, net-print/c2esp/files/

2020-11-28 Thread David Seifert
commit: b2c34e86772c33a88fb514cd82d1f3c56969c91c
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:09:03 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:09:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2c34e86

net-print/c2esp: fix build with gcc-10

* Thanks to Sam James for providing the patch link

Closes: https://bugs.gentoo.org/708236
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 net-print/c2esp/c2esp-27.ebuild|  6 ++--
 net-print/c2esp/files/c2esp-27-fno-common.patch| 32 ++
 ...ludes.patch => c2esp-27-missing-includes.patch} |  0
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/net-print/c2esp/c2esp-27.ebuild b/net-print/c2esp/c2esp-27.ebuild
index 69e58fbb92f..f7fe2a2c6a3 100644
--- a/net-print/c2esp/c2esp-27.ebuild
+++ b/net-print/c2esp/c2esp-27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,6 +6,7 @@ EAPI=7
 DESCRIPTION="A CUPS filter for Kodak ESP printers"
 HOMEPAGE="https://sourceforge.net/projects/cupsdriverkodak;
 SRC_URI="mirror://sourceforge/cupsdriverkodak/files/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
@@ -17,7 +18,8 @@ DEPEND=">=media-libs/jbigkit-2.0-r1:=
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-   "${FILESDIR}"/0001-Fix-various-missing-includes.patch
+   "${FILESDIR}"/${P}-missing-includes.patch
+   "${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_configure() {

diff --git a/net-print/c2esp/files/c2esp-27-fno-common.patch 
b/net-print/c2esp/files/c2esp-27-fno-common.patch
new file mode 100644
index 000..8e4dc81519e
--- /dev/null
+++ b/net-print/c2esp/files/c2esp-27-fno-common.patch
@@ -0,0 +1,32 @@
+Taken from: 
https://sources.debian.org/patches/c2esp/27-8/0002-Add-extern-stanzas-to-variable-definitions-in-header.patch/
+Author: Didier Raboud 
+
+--- a/src/c2espcommon.c
 b/src/c2espcommon.c
+@@ -42,11 +42,11 @@
+  * Globals...
+  */
+ char  CallerName[50]; /* String that identifies the calling 
program */
+-int   DoBack; /* Enables the back channel comms */ 
++extern intDoBack; /* Enables the back channel comms */
+ char  BackBuf[32000]; //for the back channel replies from the printer
+ int   BackBufLen=sizeof(BackBuf)-1;
+ FILE  *LogFile = NULL; //file descriptor for log file
+-time_tStartTime;
++extern time_t StartTime;
+ int   BlackPercent, ColourPercent;
+ 
+ time_t KeepAwake(time_t Start, int Interval, FILE *PrintFile)
+--- a/src/c2espcommon.h
 b/src/c2espcommon.h
+@@ -35,8 +35,8 @@
+ /*
+  * Globals...
+ */
+-char  BackBuf[32000]; //for the back channel replies from the printer
+-int   ColourPercent, BlackPercent; //to store the detected marker 
levels
++extern char BackBuf[32000]; //for the back channel replies from the printer
++extern int ColourPercent, BlackPercent; //to store the detected marker levels
+ 
+ 
+ time_t KeepAwake(time_t Start, int Interval, FILE *PrintFile);

diff --git a/net-print/c2esp/files/0001-Fix-various-missing-includes.patch 
b/net-print/c2esp/files/c2esp-27-missing-includes.patch
similarity index 100%
rename from net-print/c2esp/files/0001-Fix-various-missing-includes.patch
rename to net-print/c2esp/files/c2esp-27-missing-includes.patch



[gentoo-commits] repo/gentoo:master commit in: acct-user/ziproxy/

2020-11-28 Thread David Seifert
commit: 3b22e93bdd3ad912616472473afbb7d726970cb9
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:08:40 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:08:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b22e93b

acct-user/ziproxy: Add user for ziproxy

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 acct-user/ziproxy/metadata.xml |  5 +
 acct-user/ziproxy/ziproxy-0.ebuild | 11 +++
 2 files changed, 16 insertions(+)

diff --git a/acct-user/ziproxy/metadata.xml b/acct-user/ziproxy/metadata.xml
new file mode 100644
index 000..7a38bb90096
--- /dev/null
+++ b/acct-user/ziproxy/metadata.xml
@@ -0,0 +1,5 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+

diff --git a/acct-user/ziproxy/ziproxy-0.ebuild 
b/acct-user/ziproxy/ziproxy-0.ebuild
new file mode 100644
index 000..ea999861d75
--- /dev/null
+++ b/acct-user/ziproxy/ziproxy-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=367
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps



[gentoo-commits] repo/gentoo:master commit in: app-doc/halibut/, app-doc/halibut/files/

2020-11-28 Thread David Seifert
commit: de2c720021b8aad37dd392a1a395fb47cf474bb9
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:08:43 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:08:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2c7200

app-doc/halibut: fix build with gcc-10

* Thanks to lekto  o2.pl for submitting the patch

Closes: https://bugs.gentoo.org/707020
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 app-doc/halibut/files/halibut-1.2-fno-common.patch | 22 ++
 app-doc/halibut/halibut-1.2.ebuild |  5 +++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app-doc/halibut/files/halibut-1.2-fno-common.patch 
b/app-doc/halibut/files/halibut-1.2-fno-common.patch
new file mode 100644
index 000..e547e304d9c
--- /dev/null
+++ b/app-doc/halibut/files/halibut-1.2-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/bk_paper.c
 b/bk_paper.c
+@@ -75,6 +75,8 @@
+ #include "halibut.h"
+ #include "paper.h"
+ 
++font_info *all_fonts;
++
+ typedef struct paper_conf_Tag paper_conf;
+ typedef struct paper_idx_Tag paper_idx;
+ 
+--- a/paper.h
 b/paper.h
+@@ -78,7 +78,7 @@ struct ligature_Tag {
+  * metrics are read in.
+  */
+ 
+-font_info *all_fonts;
++extern font_info *all_fonts;
+ 
+ struct font_info_Tag {
+ font_info *next;

diff --git a/app-doc/halibut/halibut-1.2.ebuild 
b/app-doc/halibut/halibut-1.2.ebuild
index 13c64206e3f..933b648f2be 100644
--- a/app-doc/halibut/halibut-1.2.ebuild
+++ b/app-doc/halibut/halibut-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,8 @@ 
SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}/${P}.tar.gz;
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_compile() {
tc-export CC



[gentoo-commits] repo/gentoo:master commit in: media-tv/w_scan/files/, media-tv/w_scan/

2020-11-28 Thread David Seifert
commit: c06f102948f0b9c21f8870d2a1361e018d80ac77
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:08:54 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:08:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06f1029

media-tv/w_scan: port to EAPI 7

* Thanks to Sam James for providing the patch link

Closes: https://bugs.gentoo.org/707718
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 .../w_scan/files/w_scan-20170107-fno-common.patch  | 24 ++
 media-tv/w_scan/w_scan-20170107.ebuild | 11 +-
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/media-tv/w_scan/files/w_scan-20170107-fno-common.patch 
b/media-tv/w_scan/files/w_scan-20170107-fno-common.patch
new file mode 100644
index 000..43bd7144eeb
--- /dev/null
+++ b/media-tv/w_scan/files/w_scan-20170107-fno-common.patch
@@ -0,0 +1,24 @@
+Taken from: 
https://git.buildroot.net/buildroot/tree/package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch?id=2e8bf36dc4421f2213f8fa6de91b2c9bf3d64e45
+Author: Fabrice Fontaine 
+
+--- w_scan-20170107.orig/si_types.h2020-09-20 11:09:56.776963441 +0200
 w_scan-20170107/si_types.h 2020-09-20 11:13:13.149232478 +0200
+@@ -114,7 +114,7 @@
+   uint32_t logical_channel_number;
+   uint8_t  running;
+   void   * priv;
+-} service_t, * p_service_t;
++};
+ 
+ 
/***
+ /* transponder type.
+@@ -201,7 +201,7 @@
+   /**/
+   char * network_name;
+   network_change_t network_change;
+-} __attribute__((packed))  transponder_t, * p_transponder_t;
++} __attribute__((packed));
+ 
+ 
/***
+ /* satellite channel routing type.
+

diff --git a/media-tv/w_scan/w_scan-20170107.ebuild 
b/media-tv/w_scan/w_scan-20170107.ebuild
index 0b7e605bf66..926e92f2c2c 100644
--- a/media-tv/w_scan/w_scan-20170107.ebuild
+++ b/media-tv/w_scan/w_scan-20170107.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Scan DVB-C/DVB-T/DVB-S channels"
 HOMEPAGE="http://wirbel.htpc-forum.de/w_scan/index2.html;
@@ -13,12 +13,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 
 DEPEND=">=virtual/linuxtv-dvb-headers-5.8"
-RDEPEND=""
 
-src_install() {
-   emake DESTDIR="${D}" install
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
-   dodoc ChangeLog README
+src_install() {
+   default
 
if use doc; then
dodoc doc/README.file_formats doc/README_VLC_DVB



[gentoo-commits] repo/gentoo:master commit in: acct-group/sniproxy/

2020-11-28 Thread David Seifert
commit: 3fce5a956155a5e9506816eba669aa4c367b0bf8
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:08:31 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:08:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fce5a95

acct-group/sniproxy: Add new group for sniproxy

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 acct-group/sniproxy/metadata.xml  | 12 
 acct-group/sniproxy/sniproxy-0.ebuild |  8 
 2 files changed, 20 insertions(+)

diff --git a/acct-group/sniproxy/metadata.xml b/acct-group/sniproxy/metadata.xml
new file mode 100644
index 000..89aeeb96e86
--- /dev/null
+++ b/acct-group/sniproxy/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   nemuna...@nemunai.re
+   Pierre-Olivier Mercier
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+

diff --git a/acct-group/sniproxy/sniproxy-0.ebuild 
b/acct-group/sniproxy/sniproxy-0.ebuild
new file mode 100644
index 000..526eb45957e
--- /dev/null
+++ b/acct-group/sniproxy/sniproxy-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=366



[gentoo-commits] repo/gentoo:master commit in: acct-group/ziproxy/

2020-11-28 Thread David Seifert
commit: b0b4839ed87eaab04958f89d14424391c94bb463
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:08:34 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:08:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b4839e

acct-group/ziproxy: Add group for ziproxy

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 acct-group/ziproxy/metadata.xml | 5 +
 acct-group/ziproxy/ziproxy-0.ebuild | 8 
 2 files changed, 13 insertions(+)

diff --git a/acct-group/ziproxy/metadata.xml b/acct-group/ziproxy/metadata.xml
new file mode 100644
index 000..7a38bb90096
--- /dev/null
+++ b/acct-group/ziproxy/metadata.xml
@@ -0,0 +1,5 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+

diff --git a/acct-group/ziproxy/ziproxy-0.ebuild 
b/acct-group/ziproxy/ziproxy-0.ebuild
new file mode 100644
index 000..2a615442577
--- /dev/null
+++ b/acct-group/ziproxy/ziproxy-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=367



[gentoo-commits] repo/gentoo:master commit in: acct-user/sniproxy/

2020-11-28 Thread David Seifert
commit: 4461e501dbd680a76521336bad1366d0c6c0cde5
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 23:08:37 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 23:08:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4461e501

acct-user/sniproxy: Add user for sniproxy

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 acct-user/sniproxy/metadata.xml  | 12 
 acct-user/sniproxy/sniproxy-0.ebuild | 11 +++
 2 files changed, 23 insertions(+)

diff --git a/acct-user/sniproxy/metadata.xml b/acct-user/sniproxy/metadata.xml
new file mode 100644
index 000..89aeeb96e86
--- /dev/null
+++ b/acct-user/sniproxy/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   nemuna...@nemunai.re
+   Pierre-Olivier Mercier
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+

diff --git a/acct-user/sniproxy/sniproxy-0.ebuild 
b/acct-user/sniproxy/sniproxy-0.ebuild
new file mode 100644
index 000..d7566da9196
--- /dev/null
+++ b/acct-user/sniproxy/sniproxy-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=366
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps



[gentoo-commits] repo/gentoo:master commit in: profiles/

2020-11-28 Thread David Seifert
commit: 1502f21b5801d243ad40fba4b2cc4aa3f8d4182c
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 28 20:46:13 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 20:46:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1502f21b

package.mask: Last-rite app-text/cook

Bug: https://bugs.gentoo.org/709512
Bug: https://bugs.gentoo.org/713300
Bug: https://bugs.gentoo.org/729518
Signed-off-by: David Seifert  gentoo.org>

 profiles/package.mask | 5 +
 1 file changed, 5 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 606a81ba86b..b8ba6285bc4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,11 @@
 
 #--- END OF EXAMPLES ---
 
+# David Seifert  (2020-11-28)
+# Last release in 2002, multiple open bugs, no maintainer, no revdeps.
+# Bug #709512, #713300, #729518, Removal in 30 days.
+app-text/cook
+
 # Andreas Sturmlechner  (2020-11-25)
 # KF5 PortingAids (from kdelibs4) without any remaining revdeps. Bug #755956
 # Masked for removal in 30 days.



[gentoo-commits] data/api:master commit in: files/

2020-11-28 Thread David Seifert
commit: f2027f624935d0760fdd514d4a9719965550ba48
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 19:46:45 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 19:46:45 2020 +
URL:https://gitweb.gentoo.org/data/api.git/commit/?id=f2027f62

uid-gid.txt: Add 367 for ziproxy

Closes: https://github.com/gentoo/api-gentoo-org/pull/338
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 files/uid-gid.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/uid-gid.txt b/files/uid-gid.txt
index 010668f..ddb0947 100644
--- a/files/uid-gid.txt
+++ b/files/uid-gid.txt
@@ -267,6 +267,7 @@ openvpn_exporter355 355 acct
 postfix_exporter   356 356 acct
 nslcd  357 357 acct
 sniproxy   366 366 acct
+ziproxy367 367 acct
 octoprint  368 368 historical
 ultimaker  369 369 acct
 sks370 370 acct



[gentoo-commits] data/api:master commit in: files/

2020-11-28 Thread David Seifert
commit: 7f2be2c5cc1e70ca43cee749b4983809f8917024
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 28 19:46:42 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 28 19:46:42 2020 +
URL:https://gitweb.gentoo.org/data/api.git/commit/?id=7f2be2c5

uid-gid.txt: Add 366 for sniproxy

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 files/uid-gid.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/uid-gid.txt b/files/uid-gid.txt
index ed926c9..010668f 100644
--- a/files/uid-gid.txt
+++ b/files/uid-gid.txt
@@ -266,6 +266,7 @@ nginx-vts-exporter  354 354 acct
 openvpn_exporter   355 355 acct
 postfix_exporter   356 356 acct
 nslcd  357 357 acct
+sniproxy   366 366 acct
 octoprint  368 368 historical
 ultimaker  369 369 acct
 sks370 370 acct



[gentoo-commits] repo/gentoo:master commit in: x11-libs/xforms/files/, x11-libs/xforms/

2020-11-27 Thread David Seifert
commit: f034d2ba8860375257ff85d79d75a0fe30d68a19
Author: Jakov Smolic  sartura  hr>
AuthorDate: Fri Nov 27 17:36:37 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Fri Nov 27 17:36:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f034d2ba

x11-libs/xforms: port to EAPI 7

Closes: https://github.com/gentoo/gentoo/pull/18430
Closes: https://bugs.gentoo.org/706936
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 .../xforms/files/xforms-1.2.4-fno-common.patch | 40 +
 x11-libs/xforms/xforms-1.2.4-r1.ebuild | 51 ++
 2 files changed, 91 insertions(+)

diff --git a/x11-libs/xforms/files/xforms-1.2.4-fno-common.patch 
b/x11-libs/xforms/files/xforms-1.2.4-fno-common.patch
new file mode 100644
index 000..fd4ca7714fc
--- /dev/null
+++ b/x11-libs/xforms/files/xforms-1.2.4-fno-common.patch
@@ -0,0 +1,40 @@
+Description: Fix FTBFS with GCC 10
+Author: Paul Wise 
+Bug-Debian: https://bugs.debian.org/957439
+Origin: upstream, extracted from two separate commits:
+ 
https://git.savannah.nongnu.org/cgit/xforms.git/commit/?id=9806bce102d0c079c2c486b25ae6bdac3c98eecf
+ 
https://git.savannah.nongnu.org/cgit/xforms.git/commit/?id=2c1a9f151baf50887a517280645ec23379fb96f8
+--- a/fdesign/sp_spinner.c
 b/fdesign/sp_spinner.c
+@@ -29,7 +29,7 @@
+ #include "spec/spinner_spec.h"
+ 
+ static FD_spinnerattrib * spn_attrib;
+-FL_OBJECT *curobj;
++static FL_OBJECT *curobj;
+ 
+ 
+ /***
+--- a/fdesign/sp_twheel.c
 b/fdesign/sp_twheel.c
+@@ -38,7 +38,7 @@
+ #include "spec/twheel_spec.h"
+ 
+ static FD_twheelattrib * twheel_attrib;
+-FL_OBJECT * curobj;
++static FL_OBJECT * curobj;
+ 
+ 
+ /***
+--- a/lib/objects.c
 b/lib/objects.c
+@@ -36,6 +36,9 @@
+ 
+ #define TRANSLATE_Y( obj, form )( form->h - obj->h - obj->y )
+ 
++extern FL_OBJECT * fli_handled_obj;/*  defined in  events.c */
++extern FL_OBJECT * fli_handled_parent; /*  defined in  events.c */
++
+ extern FL_FORM * fli_fast_free_object; /* defined in forms.c */
+ 
+ extern FL_OBJECT * fli_handled_obj;/* defined in  events.c */

diff --git a/x11-libs/xforms/xforms-1.2.4-r1.ebuild 
b/x11-libs/xforms/xforms-1.2.4-r1.ebuild
new file mode 100644
index 000..665d6a64496
--- /dev/null
+++ b/x11-libs/xforms/xforms-1.2.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${P/-/_}"
+
+DESCRIPTION="A graphical user interface toolkit for X"
+HOMEPAGE="http://xforms-toolkit.org/;
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz;
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~sparc-solaris"
+IUSE="doc opengl"
+
+RDEPEND="
+   virtual/jpeg:0=
+   x11-libs/libSM
+   x11-libs/libX11
+   x11-libs/libXpm
+   opengl? ( virtual/opengl )"
+
+DEPEND="
+   ${RDEPEND}
+   x11-base/xorg-proto"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+DOCS=( ChangeLog README )
+
+src_prepare() {
+   default
+   AT_M4DIR=config eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable doc docs) \
+   $(use_enable opengl gl) \
+   --disable-static
+}
+
+src_install() {
+   default
+   find "${ED}" -name '*.la' -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/elem/files/, sci-chemistry/elem/

2020-11-27 Thread David Seifert
commit: e6a1186c2d69bc5300f1c41972cf8dfef61e8c2c
Author: Jakov Smolic  sartura  hr>
AuthorDate: Fri Nov 27 17:36:49 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Fri Nov 27 17:36:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6a1186c

sci-chemistry/elem: fix build with gcc-10

Closes: https://github.com/gentoo/gentoo/pull/18431
Closes: https://bugs.gentoo.org/706938
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-chemistry/elem/elem-1.0.3-r2.ebuild|  2 +-
 .../elem/files/elem-1.0.3-fno-common.patch | 24 ++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/elem/elem-1.0.3-r2.ebuild 
b/sci-chemistry/elem/elem-1.0.3-r2.ebuild
index 67290b4c6d8..d74c51bd8f0 100644
--- a/sci-chemistry/elem/elem-1.0.3-r2.ebuild
+++ b/sci-chemistry/elem/elem-1.0.3-r2.ebuild
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/elem/${PN}-src-${PV}-Linux.tgz"
 LICENSE="GPL-2"
 KEYWORDS="amd64 sparc x86"
 SLOT="0"
-IUSE=""
 
 DEPEND="x11-libs/xforms"
 RDEPEND="${DEPEND}"
@@ -20,6 +19,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}"/${P}-fix-build-system.patch
"${FILESDIR}"/${P}-missing-stdlib.patch
+   "${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_configure() {

diff --git a/sci-chemistry/elem/files/elem-1.0.3-fno-common.patch 
b/sci-chemistry/elem/files/elem-1.0.3-fno-common.patch
new file mode 100644
index 000..402ae079058
--- /dev/null
+++ b/sci-chemistry/elem/files/elem-1.0.3-fno-common.patch
@@ -0,0 +1,24 @@
+--- a/elem.c
 b/elem.c
+@@ -11,6 +11,9 @@
+ #include "deutsch.h"
+ #endif
+ 
++double amsumme;
++FL_OBJECT *massensumme;
++
+ 
+ 
+ FD_Periodensystem *create_form_Periodensystem(void)
+--- a/elem.h
 b/elem.h
+@@ -154,7 +154,7 @@ typedef struct {
+   void *vdata;
+   long ldata;
+ } FD_Periodensystem;
+-double amsumme;
++extern double amsumme;
+ extern FD_Periodensystem * create_form_Periodensystem(void);
+-FL_OBJECT *massensumme;
++extern FL_OBJECT *massensumme;
+ #endif /* FD_Periodensystem_h_ */



[gentoo-commits] repo/gentoo:master commit in: app-text/hnb/files/, app-text/hnb/

2020-11-27 Thread David Seifert
commit: 21b2dac90d38b07b6f1aad1bd4aec2681c4e6e8c
Author: Jakov Smolic  sartura  hr>
AuthorDate: Fri Nov 27 17:36:46 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Fri Nov 27 17:36:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21b2dac9

app-text/hnb: port to EAPI 7

Closes: https://bugs.gentoo.org/707720
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 app-text/hnb/files/hnb-1.9.18-fno-common.patch | 27 ++
 app-text/hnb/hnb-1.9.18-r1.ebuild  | 27 ++
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/app-text/hnb/files/hnb-1.9.18-fno-common.patch 
b/app-text/hnb/files/hnb-1.9.18-fno-common.patch
new file mode 100644
index 000..89a4321c414
--- /dev/null
+++ b/app-text/hnb/files/hnb-1.9.18-fno-common.patch
@@ -0,0 +1,27 @@
+--- a/src/ui.h
 b/src/ui.h
+@@ -38,6 +38,9 @@ extern int hnb_edit_posup;
+ extern int hnb_edit_posdown;
+ 
+ extern int ui_inited;
++extern int nodes_above;
++extern int active_line;
++extern int nodes_below;
+ 
+ void ui_getstr (char *prompt, char *datastorage);
+ 
+--- a/src/ui_draw.c
 b/src/ui_draw.c
+@@ -39,9 +39,9 @@
+ 
+ #define KEEPLINES 5
+ 
+-int nodes_above;
+-int active_line;
+-int nodes_below;
++extern int nodes_above;
++extern int active_line;
++extern int nodes_below;
+ 
+ static Node *up (Node *sel, Node *node)
+ {

diff --git a/app-text/hnb/hnb-1.9.18-r1.ebuild 
b/app-text/hnb/hnb-1.9.18-r1.ebuild
index a38796bc73b..2c262725c22 100644
--- a/app-text/hnb/hnb-1.9.18-r1.ebuild
+++ b/app-text/hnb/hnb-1.9.18-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="A program to organize many kinds of data in one place"
 HOMEPAGE="http://hnb.sourceforge.net/;
@@ -13,20 +14,22 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses"
-DEPEND="
-   ${RDEPEND}
-   virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-flags.patch
+   "${FILESDIR}"/${P}-include.patch
+   "${FILESDIR}"/${P}-printf.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
+   default
+
rm -r ${P} || die
rm src/cli_history.o || die
 
-   epatch \
-   "${FILESDIR}"/${P}-flags.patch \
-   "${FILESDIR}"/${P}-include.patch \
-   "${FILESDIR}"/${P}-printf.patch
-
tc-export AR CC PKG_CONFIG
 
# bug #532552



[gentoo-commits] repo/gentoo:master commit in: dev-util/difffilter/, dev-util/difffilter/files/

2020-11-27 Thread David Seifert
commit: 16e7e9c773c4b320e7287349aac293970136f61a
Author: Jakov Smolic  sartura  hr>
AuthorDate: Fri Nov 27 17:36:40 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Fri Nov 27 17:36:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e7e9c7

dev-util/difffilter: fix build with gcc-10

Closes: https://bugs.gentoo.org/706900
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-util/difffilter/difffilter-0.3.3-r1.ebuild  | 12 +---
 dev-util/difffilter/files/difffilter-0.3.3-fno-common.patch | 11 +++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/dev-util/difffilter/difffilter-0.3.3-r1.ebuild 
b/dev-util/difffilter/difffilter-0.3.3-r1.ebuild
index 1b210f17216..bffbd2c1c63 100644
--- a/dev-util/difffilter/difffilter-0.3.3-r1.ebuild
+++ b/dev-util/difffilter/difffilter-0.3.3-r1.ebuild
@@ -11,14 +11,12 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux"
 
-RDEPEND="
-   >=dev-libs/liblist-2.3.1
+RDEPEND=">=dev-libs/liblist-2.3.1
dev-libs/libstrl
-   dev-libs/tre
-"
-DEPEND="
-   ${RDEPEND}
-"
+   dev-libs/tre"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_install() {
default

diff --git a/dev-util/difffilter/files/difffilter-0.3.3-fno-common.patch 
b/dev-util/difffilter/files/difffilter-0.3.3-fno-common.patch
new file mode 100644
index 000..8e4c57738b7
--- /dev/null
+++ b/dev-util/difffilter/files/difffilter-0.3.3-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/block.h
 b/src/block.h
+@@ -38,7 +38,7 @@
+  *   The string literal ``\ No newline at end of file'' including the
+  *   newline at the end.
+  */
+-const char *DIFFFILTER_DIFF_NO_NL_AT_EOF;
++extern const char *DIFFFILTER_DIFF_NO_NL_AT_EOF;
+ 
+ struct diff_block;
+ typedef struct diff_block *diff_block_t;



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmss/files/, x11-plugins/gkrellmss/

2020-11-27 Thread David Seifert
commit: ca6c3228fe0497ccbafef790f2a60b9d5aadff1a
Author: Jakov Smolic  sartura  hr>
AuthorDate: Fri Nov 27 17:36:43 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Fri Nov 27 17:36:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca6c3228

x11-plugins/gkrellmss: fix build with gcc-10

* Thanks to Jack Ostroff  users.sourceforge.net> for
  submitting the original patch

Closes: https://bugs.gentoo.org/708804
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 x11-plugins/gkrellmss/files/gkrellmss-2.6-fno-common.patch | 12 
 x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild  |  7 +--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/gkrellmss/files/gkrellmss-2.6-fno-common.patch 
b/x11-plugins/gkrellmss/files/gkrellmss-2.6-fno-common.patch
new file mode 100644
index 000..8cb9c9e21e1
--- /dev/null
+++ b/x11-plugins/gkrellmss/files/gkrellmss-2.6-fno-common.patch
@@ -0,0 +1,12 @@
+--- a/src/gkrellmss.h
 b/src/gkrellmss.h
+@@ -212,7 +212,7 @@
+ #define   DRAW_GRID   1
+ 
+ 
+-SoundMonitor  *gkrellmss;
++extern SoundMonitor *gkrellmss;
+ 
+ 
+ void  gkrellmss_add_sound_sources(void);
+

diff --git a/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild 
b/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild
index 473087da140..e038708f288 100644
--- a/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild
+++ b/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,10 @@ RDEPEND="
sci-libs/fftw:3.0="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-Respect-LDFLAGS.patch )
+PATCHES=(
+   "${FILESDIR}"/${P}-Respect-LDFLAGS.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+)
 
 PLUGIN_SO=( src/gkrellmss$(get_modname) )
 PLUGIN_DOCS=( Themes )



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-software/

2020-11-27 Thread David Seifert
commit: b5f4fc535c4f03cf75f2d20fecae11eab20e
Author: David Seifert  gentoo  org>
AuthorDate: Fri Nov 27 12:19:44 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Fri Nov 27 12:19:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5f4

gnome-extra/gnome-software: [QA] Add sub-slot operator

* dev-libs/libxmlb-0.2.0 has a different subslot due to an ABI break.
* Invoking maintainer timeout.

Closes: https://bugs.gentoo.org/737988
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 gnome-extra/gnome-software/gnome-software-3.34.2.ebuild | 2 +-
 gnome-extra/gnome-software/gnome-software-3.36.1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome-extra/gnome-software/gnome-software-3.34.2.ebuild 
b/gnome-extra/gnome-software/gnome-software-3.34.2.ebuild
index 67e40c10e9e..1aee954135f 100644
--- a/gnome-extra/gnome-software/gnome-software-3.34.2.ebuild
+++ b/gnome-extra/gnome-software/gnome-software-3.34.2.ebuild
@@ -17,7 +17,7 @@ RESTRICT="test" # writes to and deletes files in 
/var/tmp/self-test/
 RDEPEND="
>=dev-libs/appstream-glib-0.7.14:0
>=x11-libs/gdk-pixbuf-2.32.0:2
-   >=dev-libs/libxmlb-0.1.7
+   >=dev-libs/libxmlb-0.1.7:=
net-libs/gnome-online-accounts:=
>=x11-libs/gtk+-3.22.4:3
>=dev-libs/glib-2.56:2

diff --git a/gnome-extra/gnome-software/gnome-software-3.36.1.ebuild 
b/gnome-extra/gnome-software/gnome-software-3.36.1.ebuild
index b92de3307c8..1f902741dd2 100644
--- a/gnome-extra/gnome-software/gnome-software-3.36.1.ebuild
+++ b/gnome-extra/gnome-software/gnome-software-3.36.1.ebuild
@@ -17,7 +17,7 @@ RESTRICT="test" # writes to and deletes files in 
/var/tmp/self-test/
 RDEPEND="
>=dev-libs/appstream-glib-0.7.14:0
>=x11-libs/gdk-pixbuf-2.32.0:2
-   >=dev-libs/libxmlb-0.1.7
+   >=dev-libs/libxmlb-0.1.7:=
net-libs/gnome-online-accounts:=
>=x11-libs/gtk+-3.22.4:3
>=dev-libs/glib-2.56:2



[gentoo-commits] repo/gentoo:master commit in: x11-libs/spread-sheet-widget/

2020-11-26 Thread David Seifert
commit: ba58b541e59c4230018d6429a4eea8d5d3e4a413
Author: John Helmert III  posteo  net>
AuthorDate: Thu Nov 26 22:56:25 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Thu Nov 26 22:56:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba58b541

x11-libs/spread-sheet-widget: bump to 0.6

Adding as a dependency of pspp, configure fails and asks for >=0.6 with
the current version of spread-sheet-widget.

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: John Helmert III  posteo.net>
Signed-off-by: David Seifert  gentoo.org>

 x11-libs/spread-sheet-widget/Manifest  |  1 +
 .../spread-sheet-widget-0.6.ebuild | 26 ++
 2 files changed, 27 insertions(+)

diff --git a/x11-libs/spread-sheet-widget/Manifest 
b/x11-libs/spread-sheet-widget/Manifest
index 84eb5594215..064f153ad7d 100644
--- a/x11-libs/spread-sheet-widget/Manifest
+++ b/x11-libs/spread-sheet-widget/Manifest
@@ -1 +1,2 @@
 DIST spread-sheet-widget-0.3.tar.gz 501469 BLAKE2B 
92acf196966271086b02ad3a172d0f439a84701b3074677be87c84643c6a9180685121370611b21f1c9d65ed0aeae169a6f53d9f7f418f5e8469744fb19b
 SHA512 
1b667c901e42f00e7862dab70fd9df65e69aaa09d1f9eb0e7d83ccbeb74239b24188ff096b5645150ee8c98f4881501402704db96642a41b804674cbb95d1bcc
+DIST spread-sheet-widget-0.6.tar.gz 522827 BLAKE2B 
0e68fff897915b9a74fb954d604efde4180c82550d5af7ec43cdb3bc843fefa5eaf33994e95dcd65cadf5f04c24e1d0a7f08f0c7465a35c62c434c42c48bd366
 SHA512 
7a5b436cb0411fa4759b467935b7e14a15ae83c971a449525ef19cb50584ef9293efb1f6160e3b373b5bf7b48c2688c36f8396b5942599ebcb8e2957e07179b9

diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild 
b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild
new file mode 100644
index 000..87e31eee3ad
--- /dev/null
+++ b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GNU Spread Sheet Widget"
+HOMEPAGE="https://www.gnu.org/software/ssw/;
+SRC_URI="mirror://gnu-alpha/ssw/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-libs/gtk+:3"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+   econf --disable-static
+}
+
+src_install() {
+   default
+
+   # no static archives
+   find "${ED}" -name '*.la' -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pspp/

2020-11-26 Thread David Seifert
commit: 7b0ba2efd3e40addd272c01c8d24f4d99c7b43e6
Author: John Helmert III  posteo  net>
AuthorDate: Thu Nov 26 22:56:28 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Thu Nov 26 22:56:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b0ba2ef

sci-mathematics/pspp: version bump to 1.4.1

Closes: https://github.com/gentoo/gentoo/pull/18417
Signed-off-by: John Helmert III  posteo.net>
Signed-off-by: David Seifert  gentoo.org>

 sci-mathematics/pspp/Manifest  |  1 +
 sci-mathematics/pspp/pspp-1.4.1.ebuild | 90 ++
 2 files changed, 91 insertions(+)

diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index b6717e465c4..c165db85af6 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1 +1,2 @@
 DIST pspp-1.2.0.tar.gz 7213194 BLAKE2B 
f468c6e025f996c9f806fb03e94a4497f02b774c509457cc6295bbefe37abc7e2ecf10d2876c8cff9a979d7a4264c7c185e1cec5fd1d5f2f00f1c6eae4da775e
 SHA512 
49eed2b55f10584abba18ff7d2020fd08691bbc1a3c2f332e6d283e32aa84e0abdae6092d17db9c1a539c63d85ecdfcc2dad40c94a06904b8893a1976e5e48d3
+DIST pspp-1.4.1.tar.gz 7848393 BLAKE2B 
c9232aa3d4905d4be54ae993db6a4b37b3696c748e15c8ba6c46c7e56f9974aefe597f893fdc5431af237ad3923da1ef271db39e4d94725ccf93f0a0df443ef4
 SHA512 
c664a6c6f4f1826db396ad776d81cadc791e4f661c603a7f164f70f9571a84cfae6fec116356b3f950991245b2b0dc9805e75193a055a242558cda1209e7830f

diff --git a/sci-mathematics/pspp/pspp-1.4.1.ebuild 
b/sci-mathematics/pspp/pspp-1.4.1.ebuild
new file mode 100644
index 000..5c58d5dba49
--- /dev/null
+++ b/sci-mathematics/pspp/pspp-1.4.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-any-r1 xdg
+
+DESCRIPTION="Program for statistical analysis of sampled data"
+HOMEPAGE="https://www.gnu.org/software/pspp/pspp.html;
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cairo doc examples gtk ncurses nls perl postgres test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( cairo )"
+
+RDEPEND="
+   dev-libs/libxml2:2
+   sci-libs/gsl:0=
+   sys-devel/gettext
+   sys-libs/ncurses:0=
+   sys-libs/readline:0=
+   sys-libs/zlib
+   virtual/libiconv
+   cairo? (
+   x11-libs/cairo[svg]
+   x11-libs/pango
+   )
+   gtk? (
+   x11-libs/gtk+:3
+   x11-libs/gtksourceview:3.0=
+   >=x11-libs/spread-sheet-widget-0.6
+   cairo? ( dev-util/glib-utils )
+   )
+   postgres? ( dev-db/postgresql:=[server] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+   doc? ( virtual/latex-base )
+   test? ( ${PYTHON_DEPS} )"
+
+pkg_pretend() {
+   ewarn "Starting with pspp-1.4.0 the pspp-mode emacs package is no 
longer"
+   ewarn "shipped with pspp itself, and should instead be fetched from 
ELPA:"
+   ewarn "https://elpa.gnu.org/packages/pspp-mode.html;
+}
+
+pkg_setup() {
+   use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+   default
+   sed -i '/appdata$/s/appdata$/metainfo/' Makefile.in || die
+}
+
+src_configure() {
+   econf \
+   --disable-static \
+   $(use_enable nls) \
+   $(use_with cairo) \
+   $(use_with gtk gui) \
+   $(use_with perl perl-module) \
+   $(use_with postgres libpq)
+}
+
+src_compile() {
+   default
+   if use doc; then
+   emake html pdf
+   HTML_DOCS=( doc/pspp{,-dev}.html )
+   fi
+}
+
+src_install() {
+   default
+
+   use doc && dodoc doc/pspp{,-dev}.pdf
+   if use examples; then
+   dodoc -r examples
+   docompress -x /usr/share/doc/${PF}/examples
+   fi
+
+   find "${ED}" -name '*.la' -type f -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: net-dialup/mwavem/, net-dialup/mwavem/files/

2020-11-26 Thread David Seifert
commit: c3868b2816dccb819eb62eb0570be4d0eb57e413
Author: Jakov Smolic  sartura  hr>
AuthorDate: Thu Nov 26 10:32:45 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Thu Nov 26 10:32:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3868b28

net-dialup/mwavem: port to EAPI 7

Closes: https://github.com/gentoo/gentoo/pull/18402
Closes: https://bugs.gentoo.org/724974
Closes: https://bugs.gentoo.org/707684
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 net-dialup/mwavem/files/mwavem-2.0-ar.patch| 10 ++
 .../mwavem/files/mwavem-2.0-fno-common.patch   | 22 
 net-dialup/mwavem/mwavem-2.0-r2.ebuild | 40 --
 3 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/net-dialup/mwavem/files/mwavem-2.0-ar.patch 
b/net-dialup/mwavem/files/mwavem-2.0-ar.patch
new file mode 100644
index 000..b0ce341ae6f
--- /dev/null
+++ b/net-dialup/mwavem/files/mwavem-2.0-ar.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
 b/configure.in
+@@ -12,6 +12,7 @@ dnl Find programs for building and installation.
+ AC_PROG_CC
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
++AM_PROG_AR
+ 
+ dnl Check for libraries
+ AC_CHECK_LIB(pthread, main)

diff --git a/net-dialup/mwavem/files/mwavem-2.0-fno-common.patch 
b/net-dialup/mwavem/files/mwavem-2.0-fno-common.patch
new file mode 100644
index 000..02e5b4780fd
--- /dev/null
+++ b/net-dialup/mwavem/files/mwavem-2.0-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/src/include/unidiags.h
 b/src/include/unidiags.h
+@@ -65,7 +65,7 @@ bitsSource bits Definition
+ 
+ #define BIT(x)(1<http://oss.software.ibm.com/acpmodem/;
@@ -16,37 +13,44 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DOCS=( AUTHORS ChangeLog FAQ NEWS README README.devfs THANKS )
-
 PATCHES=(
-   "${FILESDIR}/${P}-gentoo.patch"
-   "${FILESDIR}/${P}-glibc-2.10.patch"
+   "${FILESDIR}"/${P}-gentoo.patch
+   "${FILESDIR}"/${P}-glibc-2.10.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+   "${FILESDIR}"/${P}-ar.patch
 )
 
+HTML_DOCS=( doc/mwave.html )
+
+src_prepare() {
+   default
+   rm README.freebsd || die
+   mv configure.{in,ac} || die
+   AT_M4DIR=m4 eautoreconf
+}
+
 src_install() {
-   autotools-utils_src_install
+   default
 
-   dosbin "${FILESDIR}/mwave-dev-handler"
+   dosbin "${FILESDIR}"/mwave-dev-handler
 
insinto /etc/devfs.d
-   newins "${FILESDIR}/mwave.devfs" mwave
+   newins "${FILESDIR}"/mwave.devfs mwave
 
insinto /etc/modprobe.d
-   newins "${FILESDIR}/mwave.modules" mwave.conf
+   newins "${FILESDIR}"/mwave.modules mwave.conf
 
-   docinto doc
dodoc doc/mwave.sgml doc/mwave.txt
-   dohtml doc/mwave.html
 }
 
 pkg_postinst() {
-   if [ -e "${ROOT}/dev/.devfsd" ]; then
+   if [[ -e "${EROOT}"/dev/.devfsd ]]; then
# device node is created by devfs
ebegin "Restarting devfsd to reread devfs rules"
killall -HUP devfsd
eend $?
else
elog "Create device node if needed, using command like this:"
-   elog "# mknod --mode=0660 \"${ROOT}/dev/modems/mwave\" c 10 219"
+   elog "# mknod --mode=0660 \"${EROOT}/dev/modems/mwave\" c 10 
219"
fi
 }



[gentoo-commits] repo/gentoo:master commit in: x11-wm/oroborus/files/, x11-wm/oroborus/

2020-11-26 Thread David Seifert
commit: a761d6f08552139aa32011fba0c0daf9fc995e30
Author: Jakov Smolic  sartura  hr>
AuthorDate: Thu Nov 26 10:32:33 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Thu Nov 26 10:32:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a761d6f0

x11-wm/oroborus: fix build with gcc-10

Closes: https://bugs.gentoo.org/706722
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 .../files/oroborus-2.0.20-fno-common.patch | 33 ++
 x11-wm/oroborus/oroborus-2.0.20-r1.ebuild  |  5 ++--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/x11-wm/oroborus/files/oroborus-2.0.20-fno-common.patch 
b/x11-wm/oroborus/files/oroborus-2.0.20-fno-common.patch
new file mode 100644
index 000..e7a1e215715
--- /dev/null
+++ b/x11-wm/oroborus/files/oroborus-2.0.20-fno-common.patch
@@ -0,0 +1,33 @@
+--- a/src/hints.c
 b/src/hints.c
+@@ -43,7 +43,7 @@ Atom win_hints, win_state, win_client_list, win_layer, 
win_workspace,
+   win_workspace_count, win_desktop_button_proxy, win_supporting_wm_check,
+   gnome_panel_desktop_area;
+ Atom net_atoms[NET_ATOM_COUNT];
+-Display *dpy;
++extern Display *dpy;
+ 
+ void
+ initHints (Display * d)
+--- a/src/keyboard.c
 b/src/keyboard.c
+@@ -35,6 +35,8 @@
+ #include 
+ #endif
+ 
++int NumLockMask, CapsLockMask, ScrollLockMask;
++
+ void
+ parseKeyString (Display * dpy, MyKey * key, char *str)
+ {
+--- a/src/keyboard.h
 b/src/keyboard.h
+@@ -90,7 +90,7 @@ void grabKey (Display *, MyKey *, Window);
+ void ungrabKeys (Display *, Window);
+ void init_keyboard (Display * dpy);
+ 
+-int NumLockMask, CapsLockMask, ScrollLockMask;
++extern int NumLockMask, CapsLockMask, ScrollLockMask;
+ 
+ #endif /* __KEYBOARD_H */
+ 

diff --git a/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild 
b/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
index 071ee8295d3..1c0dec3cece 100644
--- a/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
+++ b/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,6 @@ SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 RDEPEND="
x11-libs/libICE
@@ -21,4 +20,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
x11-base/xorg-proto"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 DOCS=( AUTHORS ChangeLog example.${PN}rc README TODO )



[gentoo-commits] repo/gentoo:master commit in: sys-apps/restartd/, sys-apps/restartd/files/

2020-11-26 Thread David Seifert
commit: fd6ae80cf2f1191ee1504798257fe8efe26e7e9c
Author: Jakov Smolic  sartura  hr>
AuthorDate: Thu Nov 26 10:32:42 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Thu Nov 26 10:32:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd6ae80c

sys-apps/restartd: fix build with gcc-10

Closes: https://bugs.gentoo.org/707678
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 .../restartd/files/restartd-0.2.2-fno-common.patch | 66 ++
 sys-apps/restartd/restartd-0.2.2-r1.ebuild |  5 +-
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/sys-apps/restartd/files/restartd-0.2.2-fno-common.patch 
b/sys-apps/restartd/files/restartd-0.2.2-fno-common.patch
new file mode 100644
index 000..c0b0ad5ff8b
--- /dev/null
+++ b/sys-apps/restartd/files/restartd-0.2.2-fno-common.patch
@@ -0,0 +1,66 @@
+--- a/config.c
 b/config.c
+@@ -22,6 +22,14 @@
+ #include 
+ #include "config.h"
+ 
++int debug;
++int config_process_number;
++int check_interval;
++int foreground;
++char *config_file;
++struct config_process_type *config_process;
++struct config_process_type config_process_type;
++
+ int
+ read_config (void)
+ {
+--- a/config.h
 b/config.h
+@@ -34,12 +34,12 @@
+ #define DEFAULT_CONFIG "/etc/restartd.conf"
+ #define VERSION "0.2.1"
+ 
+-int debug;// Debug
+-int config_process_number;
+-int check_interval;
+-int foreground;
+-struct config_process_type *config_process;
+-char *config_file;
++extern int debug; // Debug
++extern int config_process_number;
++extern int check_interval;
++extern int foreground;
++extern struct config_process_type *config_process;
++extern char *config_file;
+ 
+ typedef struct config_process_type
+ {
+@@ -51,7 +51,9 @@ typedef struct config_process_type
+   char processes[256];
+   char status[32];
+ 
+-} config_process_type;
++};
++
++extern struct config_process_type config_process_type;
+ 
+ int read_config ( /* char *config_file */ );
+ 
+--- a/main.c
 b/main.c
+@@ -35,6 +35,14 @@
+ 
+ #include "config.h"
+ 
++extern int debug;
++extern int config_process_number;
++extern int check_interval;
++extern int foreground;
++extern char *config_file;
++extern struct config_process_type *config_process;
++extern struct config_process_type config_process_type;
++
+ // SIGTERM & SIGHUP handler
+ void
+ got_signal (int sig)

diff --git a/sys-apps/restartd/restartd-0.2.2-r1.ebuild 
b/sys-apps/restartd/restartd-0.2.2-r1.ebuild
index dadb97c5f33..6f78d10eb3a 100644
--- a/sys-apps/restartd/restartd-0.2.2-r1.ebuild
+++ b/sys-apps/restartd/restartd-0.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,8 @@ 
SRC_URI="mirror://debian/pool/main/r/restartd/${PN}_${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_prepare() {
default



[gentoo-commits] repo/gentoo:master commit in: media-gfx/arss/, media-gfx/arss/files/

2020-11-26 Thread David Seifert
commit: a2e1a626cebb57d16cf9e07f8125e4710260eb3d
Author: Jakov Smolic  sartura  hr>
AuthorDate: Thu Nov 26 10:32:39 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Thu Nov 26 10:32:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e1a626

media-gfx/arss: port to EAPI 7

Closes: https://bugs.gentoo.org/707664
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 media-gfx/arss/arss-0.2.3-r1.ebuild  | 13 ++---
 media-gfx/arss/files/arss-0.2.3-fno-common.patch | 67 
 2 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/media-gfx/arss/arss-0.2.3-r1.ebuild 
b/media-gfx/arss/arss-0.2.3-r1.ebuild
index 955a208de67..63a92efd72c 100644
--- a/media-gfx/arss/arss-0.2.3-r1.ebuild
+++ b/media-gfx/arss/arss-0.2.3-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 CMAKE_IN_SOURCE_BUILD="true"
-MY_P=${P}-src
+MY_P="${P}-src"
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Analysis & Resynthesis Sound Spectrograph"
 HOMEPAGE="http://arss.sourceforge.net;
@@ -14,11 +14,12 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 DEPEND="sci-libs/fftw:3.0="
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}/src
+S="${WORKDIR}/${MY_P}/src"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 DOCS=( ../AUTHORS ../ChangeLog )

diff --git a/media-gfx/arss/files/arss-0.2.3-fno-common.patch 
b/media-gfx/arss/files/arss-0.2.3-fno-common.patch
new file mode 100644
index 000..a575c248c34
--- /dev/null
+++ b/media-gfx/arss/files/arss-0.2.3-fno-common.patch
@@ -0,0 +1,67 @@
+--- a/arss.c
 b/arss.c
+@@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA  02110-1301, USA.*
+ 
+ char *version = "0.2.3";
+ char *date = "May 29th, 2008";
++extern int32_t quiet;
+ 
+ #define MSG_NUMBER_EXPECTED "A number is expected after %s\nExiting with 
error.\n"
+ 
+--- a/dsp.c
 b/dsp.c
+@@ -1,5 +1,12 @@
+ #include "dsp.h"
+ 
++double pi;
++double LOGBASE;
++double LOOP_SIZE_SEC;
++int32_t BMSQ_LUT_SIZE;
++int32_t clocka;
++
++
+ void fft(double *in, double *out, int32_t N, uint8_t method)
+ {
+   /* method :
+--- a/dsp.h
 b/dsp.h
+@@ -17,13 +17,13 @@
+ #define LOOP_SIZE_SEC_D   10.0
+ #define BMSQ_LUT_SIZE_D   16000
+ 
+-double pi;
+-double LOGBASE;   // Base for log() operations. Anything 
other than 2 isn't really supported
++extern double pi;
++extern double LOGBASE;// Base for log() operations. 
Anything other than 2 isn't really supported
+ #define TRANSITION_BW_SYNT 16.0   // defines the transition 
bandwidth for the low-pass filter on the envelopes during synthesisation
+-double LOOP_SIZE_SEC; // size of the noise loops in seconds
+-int32_t BMSQ_LUT_SIZE;// defines the number of elements in 
the Blackman Square look-up table. It's best to make it small enough to be 
entirely cached
++extern double LOOP_SIZE_SEC;  // size of the noise loops in seconds
++extern int32_t BMSQ_LUT_SIZE; // defines the number of elements in 
the Blackman Square look-up table. It's best to make it small enough to be 
entirely cached
+ 
+-int32_t clocka;
++extern int32_t clocka;
+ 
+ extern void fft(double *in, double *out, int32_t N, uint8_t method);
+ extern void normi(double **s, int32_t xs, int32_t ys, double ratio);
+--- a/util.c
 b/util.c
+@@ -1,5 +1,7 @@
+ #include "util.h"
+ 
++int32_t quiet;
++
+ void win_return()
+ {
+   #ifdef WIN32
+--- a/util.h
 b/util.h
+@@ -11,7 +11,7 @@
+ 
+ #include "dsp.h"
+ 
+-int32_t quiet;
++extern int32_t quiet;
+ 
+ extern void win_return();
+ extern int32_t gettime();



[gentoo-commits] repo/gentoo:master commit in: media-libs/icclib/files/, media-libs/icclib/

2020-11-26 Thread David Seifert
commit: a854857e471de03b5b2f67b03b835f58db750768
Author: Jakov Smolic  sartura  hr>
AuthorDate: Thu Nov 26 10:32:30 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Thu Nov 26 10:32:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a854857e

media-libs/icclib: fix build with gcc-10

Closes: https://bugs.gentoo.org/707306
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 media-libs/icclib/files/icclib-2.14-fno-common.patch | 17 +
 media-libs/icclib/icclib-2.14.ebuild |  5 -
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/media-libs/icclib/files/icclib-2.14-fno-common.patch 
b/media-libs/icclib/files/icclib-2.14-fno-common.patch
new file mode 100644
index 000..564822b9fc8
--- /dev/null
+++ b/media-libs/icclib/files/icclib-2.14-fno-common.patch
@@ -0,0 +1,17 @@
+--- a/icc.h
 b/icc.h
+@@ -1705,12 +1705,12 @@ extern ICCLIB_API void icm1960UCS21964WUV(icmXYZNumber 
*w, double *out, double *
+ /* The standard D50 illuminant value */
+ extern icmXYZNumber icmD50;
+ extern icmXYZNumber icmD50_100;   /* Scaled to 100 */
+-double icmD50_ary3[3];/* As an array */
++extern double icmD50_ary3[3]; /* As an array */
+ 
+ /* The standard D65 illuminant value */
+ extern icmXYZNumber icmD65;
+ extern icmXYZNumber icmD65_100;   /* Scaled to 100 */
+-double icmD65_ary3[3];/* As an array */
++extern double icmD65_ary3[3]; /* As an array */
+ 
+ /* The default black value */
+ extern icmXYZNumber icmBlack;

diff --git a/media-libs/icclib/icclib-2.14.ebuild 
b/media-libs/icclib/icclib-2.14.ebuild
index c9b8483e17a..b472dd74897 100644
--- a/media-libs/icclib/icclib-2.14.ebuild
+++ b/media-libs/icclib/icclib-2.14.ebuild
@@ -19,7 +19,10 @@ BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
-PATCHES=( "${FILESDIR}"/${P}-make.patch )
+PATCHES=(
+   "${FILESDIR}"/${P}-make.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_compile() {
ICCLIB_SOVERSION="0"



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkwebmon/files/, x11-plugins/gkwebmon/

2020-11-26 Thread David Seifert
commit: 7c1f5a1f4a79f5d2239904dab2689d515ba9d6ad
Author: Jakov Smolic  sartura  hr>
AuthorDate: Thu Nov 26 10:32:36 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Thu Nov 26 10:32:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c1f5a1f

x11-plugins/gkwebmon: fix build with gcc-10

Closes: https://bugs.gentoo.org/707226
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 patch => gkwebmon-0.2-cc-cflags-ldflags.patch} |  0
 .../gkwebmon/files/gkwebmon-0.2-fno-common.patch   | 38 ++
 x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild|  6 ++--
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/gkwebmon/files/respect-cc-cflags-ldflags.patch 
b/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch
similarity index 100%
rename from x11-plugins/gkwebmon/files/respect-cc-cflags-ldflags.patch
rename to x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch

diff --git a/x11-plugins/gkwebmon/files/gkwebmon-0.2-fno-common.patch 
b/x11-plugins/gkwebmon/files/gkwebmon-0.2-fno-common.patch
new file mode 100644
index 000..9738177db6f
--- /dev/null
+++ b/x11-plugins/gkwebmon/files/gkwebmon-0.2-fno-common.patch
@@ -0,0 +1,38 @@
+--- a/webmon.c
 b/webmon.c
+@@ -7,6 +7,8 @@
+ #include 
+ #include 
+ 
++int updatetime;
++
+ 
+ void clear_entry(int i)
+ {
+--- a/webmon.h
 b/webmon.h
+@@ -6,7 +6,7 @@
+ 
+ /* this is included in the saved config file */
+ 
+-int   updatetime;   /* how often to check webpages (in hours) */
++extern intupdatetime;   /* how often to check webpages (in hours) */
+ 
+ struct webinfo {
+   char  *urlData;   /* full url, pointed into by pointers below, 
internal '\0' */
+@@ -21,11 +21,13 @@ struct webinfo {
+   charuse;
+   charupdated; /* new md5 checksum in place */
+   charflagged; /* a changed has been posted to tooltips for 
this entry */
+-} wi[20];
++};
++
++extern struct webinfo wi[20];
+ 
+ /* end of data for config file */
+ 
+-char wheretostore;  /* 0 == webinfo.init_md5, 1 == webinfo.new_md5 */
++extern char wheretostore;  /* 0 == webinfo.init_md5, 1 == webinfo.new_md5 */
+ 
+ void parse_url_to_config_struct(int i, gchar *instr);  /* parse URL and store 
data in webinfo struct */
+ char *make_url_from_config_struct(int i);

diff --git a/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild 
b/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
index d7fc617e943..5a5387b6c02 100644
--- a/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
+++ b/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ppc ~sparc x86"
-IUSE=""
 
 # The Makefile links with -lssl.
 RDEPEND="
@@ -20,7 +19,10 @@ RDEPEND="
dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/respect-cc-cflags-ldflags.patch )
+PATCHES=(
+   "${FILESDIR}"/${P}-cc-cflags-ldflags.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_compile() {
emake CC="$(tc-getCC)"



[gentoo-commits] repo/gentoo:master commit in: x11-misc/spacefm/files/, x11-misc/spacefm/

2020-11-25 Thread David Seifert
commit: 3e0cc5d786d6d56e8eb145e515b461a6073ce169
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Nov 25 17:37:26 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 25 17:37:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e0cc5d7

x11-misc/spacefm: port to EAPI 7

Closes: https://bugs.gentoo.org/708384
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 x11-misc/spacefm/files/spacefm-fno-common.patch | 86 
 x11-misc/spacefm/metadata.xml   |  2 -
 x11-misc/spacefm/spacefm-1.0.6-r1.ebuild| 68 +++
 x11-misc/spacefm/spacefm-1.0.6.ebuild   | 88 -
 x11-misc/spacefm/spacefm-.ebuild| 60 ++---
 5 files changed, 174 insertions(+), 130 deletions(-)

diff --git a/x11-misc/spacefm/files/spacefm-fno-common.patch 
b/x11-misc/spacefm/files/spacefm-fno-common.patch
new file mode 100644
index 000..4cdc834a827
--- /dev/null
+++ b/x11-misc/spacefm/files/spacefm-fno-common.patch
@@ -0,0 +1,86 @@
+--- a/src/settings.c
 b/src/settings.c
+@@ -52,6 +52,24 @@
+ /* Dirty hack: check whether we are under LXDE or not */
+ #define is_under_LXDE() (g_getenv( "_LXSESSION_PID" ) != NULL)
+ 
++char* settings_terminal_su = NULL;
++char* settings_graphical_su = NULL;
++GList* xset_cmd_history = NULL;
++XSet* evt_win_focus = NULL;
++XSet* evt_win_move = NULL;
++XSet* evt_win_click = NULL;
++XSet* evt_win_key = NULL;
++XSet* evt_win_close = NULL;
++XSet* evt_pnl_show = NULL;
++XSet* evt_pnl_focus = NULL;
++XSet* evt_pnl_sel = NULL;
++XSet* evt_tab_new = NULL;
++XSet* evt_tab_chdir = NULL;
++XSet* evt_tab_focus = NULL;
++XSet* evt_tab_close = NULL;
++XSet* evt_device = NULL;
++
++
+ AppSettings app_settings = {0};
+ /* const gboolean singleInstance_default = TRUE; */
+ const gboolean show_hidden_files_default = FALSE;
+--- a/src/settings.h
 b/src/settings.h
+@@ -120,7 +120,7 @@ const char* xset_get_user_tmp_dir();
+ 
///
+ //MOD extra settings below
+ 
+-GList* xsets;
++extern GList* xsets;
+ 
+ enum {
+ XSET_B_UNSET,
+@@ -311,22 +311,22 @@ typedef struct
+ } XMenuItem;
+ 
+ // cache these for speed in event handlers
+-XSet* evt_win_focus;
+-XSet* evt_win_move;
+-XSet* evt_win_click;
+-XSet* evt_win_key;
+-XSet* evt_win_close;
+-XSet* evt_pnl_show;
+-XSet* evt_pnl_focus;
+-XSet* evt_pnl_sel;
+-XSet* evt_tab_new;
+-XSet* evt_tab_chdir;
+-XSet* evt_tab_focus;
+-XSet* evt_tab_close;
+-XSet* evt_device;
++extern XSet* evt_win_focus;
++extern XSet* evt_win_move;
++extern XSet* evt_win_click;
++extern XSet* evt_win_key;
++extern XSet* evt_win_close;
++extern XSet* evt_pnl_show;
++extern XSet* evt_pnl_focus;
++extern XSet* evt_pnl_sel;
++extern XSet* evt_tab_new;
++extern XSet* evt_tab_chdir;
++extern XSet* evt_tab_focus;
++extern XSet* evt_tab_close;
++extern XSet* evt_device;
+ 
+ // instance-wide command history
+-GList* xset_cmd_history;
++extern GList* xset_cmd_history;
+ 
+ static const char* terminal_programs[] =  //for pref-dialog.c
+ {
+@@ -374,8 +374,8 @@ static const char* gsu_commands[] = // order and contents 
must match prefdlg.ui
+ };
+ 
+ // These will contain the su and gsu settings from /etc/spacefm/spacefm.conf
+-char* settings_terminal_su;
+-char* settings_graphical_su;
++extern char* settings_terminal_su;
++extern char* settings_graphical_su;
+ 
+ typedef struct
+ {

diff --git a/x11-misc/spacefm/metadata.xml b/x11-misc/spacefm/metadata.xml
index 35fc0bff16f..f5c9eb81f00 100644
--- a/x11-misc/spacefm/metadata.xml
+++ b/x11-misc/spacefm/metadata.xml
@@ -14,8 +14,6 @@
ignorantguru/spacefm


-   Support GTK+ 2.x instead of GTK+ 3.x
-   Support GTK+ 3.x instead of GTK+ 2.x
Support video thumbnails with 
media-video/ffmpegthumbnailer



diff --git a/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild 
b/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild
new file mode 100644
index 000..b206e28490a
--- /dev/null
+++ b/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info optfeature xdg
+
+DESCRIPTION="A multi-panel tabbed file manager"
+HOMEPAGE="https://ignorantguru.github.com/spacefm/;
+if [[ ${PV} == ** ]]; then
+   EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git;
+   EGIT_BRANCH="next"
+   inherit git-r3
+else
+   KEYWORDS="amd64 x86"
+   SRC_URI="https://github.com/IgnorantGuru/spacefm/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+startup-notification +video-thumbnails"
+
+RDEPEND=&

[gentoo-commits] repo/gentoo:master commit in: net-dns/https_dns_proxy/

2020-11-25 Thread David Seifert
commit: 922290d4950d8c2be8d43dc010ba0a1571207fd2
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Nov 25 17:37:20 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 25 17:37:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=922290d4

net-dns/https_dns_proxy: fix automagic gtest dep

* Tests are not ready yet

Closes: https://github.com/gentoo/gentoo/pull/18296
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 .../https_dns_proxy/https_dns_proxy-0_pre20200925.ebuild  | 15 ---
 net-dns/https_dns_proxy/https_dns_proxy-.ebuild   | 15 ---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/net-dns/https_dns_proxy/https_dns_proxy-0_pre20200925.ebuild 
b/net-dns/https_dns_proxy/https_dns_proxy-0_pre20200925.ebuild
index c7003379c00..d2ca352cd24 100644
--- a/net-dns/https_dns_proxy/https_dns_proxy-0_pre20200925.ebuild
+++ b/net-dns/https_dns_proxy/https_dns_proxy-0_pre20200925.ebuild
@@ -20,12 +20,21 @@ HOMEPAGE="https://github.com/aarond10/https_dns_proxy;
 LICENSE="MIT"
 SLOT="0"
 
-DEPEND="dev-libs/libev
+RDEPEND="
+   dev-libs/libev
net-dns/c-ares
net-misc/curl[http2,ssl]"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_DISABLE_FIND_PACKAGE_GTest=ON
+   -DCLANG_TIDY_EXE=OFF
+   )
+   cmake_src_configure
+}
 
 src_install() {
cmake_src_install
-   dobin "${WORKDIR}/${P}_build/https_dns_proxy"
+   dobin "${BUILD_DIR}"/https_dns_proxy
 }

diff --git a/net-dns/https_dns_proxy/https_dns_proxy-.ebuild 
b/net-dns/https_dns_proxy/https_dns_proxy-.ebuild
index 3c26883fb12..d2ca352cd24 100644
--- a/net-dns/https_dns_proxy/https_dns_proxy-.ebuild
+++ b/net-dns/https_dns_proxy/https_dns_proxy-.ebuild
@@ -20,12 +20,21 @@ HOMEPAGE="https://github.com/aarond10/https_dns_proxy;
 LICENSE="MIT"
 SLOT="0"
 
-DEPEND="dev-libs/libev
+RDEPEND="
+   dev-libs/libev
net-dns/c-ares
net-misc/curl[http2,ssl]"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_DISABLE_FIND_PACKAGE_GTest=ON
+   -DCLANG_TIDY_EXE=OFF
+   )
+   cmake_src_configure
+}
 
 src_install() {
cmake_src_install
-   dobin "${S}_build/https_dns_proxy"
+   dobin "${BUILD_DIR}"/https_dns_proxy
 }



[gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/files/, net-misc/minidlna/

2020-11-25 Thread David Seifert
commit: 938fc4a06b68c67f608333fd670bf05b97926ed3
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Nov 25 17:37:32 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 25 17:37:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=938fc4a0

net-misc/minidlna: fix build with gcc-10

* Thanks to event event.riga  gmail.com for submitting the original patch

Closes: https://github.com/gentoo/gentoo/pull/18396
Closes: https://bugs.gentoo.org/706916
Closes: https://bugs.gentoo.org/715270
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 .../minidlna/files/minidlna-1.2.1-fno-common.patch | 45 ++
 net-misc/minidlna/minidlna-1.2.1-r1.ebuild |  4 +-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch 
b/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch
new file mode 100644
index 000..5cca89b52db
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch
@@ -0,0 +1,45 @@
+--- a/image_utils.c
 b/image_utils.c
+@@ -190,7 +190,7 @@ jpeg_memory_src(j_decompress_ptr cinfo, const unsigned 
char * buffer, size_t buf
+   src->pub.bytes_in_buffer = bufsize;
+ }
+ 
+-jmp_buf setjmp_buffer;
++static jmp_buf setjmp_buffer;
+ /* Don't exit on error like libjpeg likes to do */
+ static void
+ libjpeg_error_handler(j_common_ptr cinfo)
+--- a/metadata.c
 b/metadata.c
+@@ -484,7 +484,7 @@ GetAudioMetadata(const char *path, const char *name)
+ }
+ 
+ /* For libjpeg error handling */
+-jmp_buf setjmp_buffer;
++static jmp_buf setjmp_buffer;
+ static void
+ libjpeg_error_handler(j_common_ptr cinfo)
+ {
+--- a/tivo_utils.c
 b/tivo_utils.c
+@@ -27,6 +27,7 @@
+ #include 
+ #include "tivo_utils.h"
+ 
++struct sqlite3PrngType sqlite3Prng;
+ /* This function based on byRequest */
+ char *
+ decodeString(char *string, int inplace)
+--- a/tivo_utils.h
 b/tivo_utils.h
+@@ -30,7 +30,9 @@ struct sqlite3PrngType {
+   unsigned char isInit;  /* True if initialized */
+   unsigned char i, j;/* State variables */
+   unsigned char s[256];  /* State variables */
+-} sqlite3Prng;
++};
++
++extern struct sqlite3PrngType sqlite3Prng;
+ 
+ char *
+ decodeString(char *string, int inplace);

diff --git a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild 
b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
index 47ee6484cd2..9d6ba5c94f4 100644
--- a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
+++ b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE="netgear readynas zeroconf"
+IUSE="elibc_musl netgear readynas zeroconf"
 
 RDEPEND="dev-db/sqlite:3
media-libs/flac:=
@@ -24,6 +24,7 @@ RDEPEND="dev-db/sqlite:3
media-libs/libvorbis:=
media-video/ffmpeg:0=
virtual/jpeg:0=
+   elibc_musl? ( sys-libs/queue-standalone )
zeroconf? ( net-dns/avahi:= )"
 DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -32,6 +33,7 @@ CONFIG_CHECK="~INOTIFY_USER"
 
 PATCHES=(
"${WORKDIR}"/minidlna-gentoo-artwork.patch
+   "${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/purple-libnotify-plus/files/, x11-plugins/purple-libnotify-plus/

2020-11-25 Thread David Seifert
commit: 8a296ea717812962ffe8a8aef243e3e8c34646d6
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Nov 25 17:37:23 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 25 17:37:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a296ea7

x11-plugins/purple-libnotify-plus: port to EAPI 7

Closes: https://bugs.gentoo.org/717422
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 .../files/purple-libnotify-plus-2.99.1-fno-common.patch | 11 +++
 .../purple-libnotify-plus-2.99.1.ebuild | 13 -
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git 
a/x11-plugins/purple-libnotify-plus/files/purple-libnotify-plus-2.99.1-fno-common.patch
 
b/x11-plugins/purple-libnotify-plus/files/purple-libnotify-plus-2.99.1-fno-common.patch
new file mode 100644
index 000..12d2cdda8de
--- /dev/null
+++ 
b/x11-plugins/purple-libnotify-plus/files/purple-libnotify-plus-2.99.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/purple-libnotify+-common.h
 b/src/purple-libnotify+-common.h
+@@ -27,7 +27,7 @@
+ 
+ extern PurplePlugin *notify_plus;
+ 
+-struct
++extern struct
+ {
+   gboolean modify_notification;
+   gboolean use_svg;

diff --git 
a/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild 
b/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
index 5a3198f74a1..54ed903d1c5 100644
--- a/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
+++ b/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Provide libnotify interface to Pidgin and Finch"
 HOMEPAGE="http://purple-libnotify-plus.sardemff7.net/;
@@ -12,18 +12,21 @@ 
SRC_URI="https://github.com/sardemff7/purple-libnotify-plus/archive/v${PV}.tar.g
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
net-im/pidgin
>=net-im/purple-events-0.99.1
x11-libs/gdk-pixbuf
>=x11-libs/libnotify-0.7.0"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-util/intltool
sys-devel/gettext
virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 src_prepare() {
+   default
eautoreconf
 }



[gentoo-commits] repo/gentoo:master commit in: sys-block/cec/files/, sys-block/cec/

2020-11-25 Thread David Seifert
commit: 8a50aecb570f1c7a22f9b0d1fda5ce6a24f2e562
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Nov 25 17:37:29 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 25 17:37:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a50aecb

sys-block/cec: port to EAPI 7

Closes: https://github.com/gentoo/gentoo/pull/18376
Closes: https://bugs.gentoo.org/706974
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sys-block/cec/cec-14.ebuild |  7 ++--
 sys-block/cec/files/cec-14-fno-common.patch | 57 +
 2 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/sys-block/cec/cec-14.ebuild b/sys-block/cec/cec-14.ebuild
index 1b70ba738da..367dcfda642 100644
--- a/sys-block/cec/cec-14.ebuild
+++ b/sys-block/cec/cec-14.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,7 +12,8 @@ SRC_URI="mirror://sourceforge/aoetools/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"

diff --git a/sys-block/cec/files/cec-14-fno-common.patch 
b/sys-block/cec/files/cec-14-fno-common.patch
new file mode 100644
index 000..e7e3ce02267
--- /dev/null
+++ b/sys-block/cec/files/cec-14-fno-common.patch
@@ -0,0 +1,57 @@
+--- a/cec.c
 b/cec.c
+@@ -20,6 +20,9 @@
+ typedef struct Shelf Shelf;
+ typedef struct Pkt Pkt;
+ 
++int debug;
++char *progname;
++
+ struct Pkt {
+   uchar   dst[6];
+   uchar   src[6];
+@@ -76,7 +79,7 @@ extern int errno;
+ Shelf tab[Ntab];
+ int   ntab;
+ uchar contag;
+-externint fd; /* set in netopen */
++int fd;   /* set in netopen */
+ int   shelf;
+ Shelf *connp;
+ char  esc = '';
+--- a/cec.h
 b/cec.h
+@@ -6,8 +6,8 @@ typedef unsigned char uchar;
+ typedef unsigned int uint;
+ #endif
+ 
+-int debug;
+-char *progname;
++extern int debug;
++extern char *progname;
+ extern char hbacecfile[];
+ 
+ int netopen(char *name);
+--- a/hba.c
 b/hba.c
+@@ -9,7 +9,7 @@
+ 
+ #include "cec.h"
+ 
+-int fd;
++extern int fd;
+ static char hba_bytes[1<<14];
+ static int hba_len;
+ 
+--- a/linux.c
 b/linux.c
+@@ -25,7 +25,8 @@
+ 
+ #include "cec.h"
+ 
+-int fd;
++extern int fd;
++extern int debug;
+ char net_bytes[1<<14];
+ int net_len;
+ char srcaddr[6];



[gentoo-commits] repo/gentoo:master commit in: x11-misc/gcolor2/, x11-misc/gcolor2/files/

2020-11-22 Thread David Seifert
commit: c462eca3f71a06c416cda3c805ac1f89af4a3441
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 22 17:32:04 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 22 17:32:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c462eca3

x11-misc/gcolor2: Port to EAPI 7

Closes: https://bugs.gentoo.org/708752
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../gcolor2/files/gcolor2-0.4-fno-common.patch | 27 ++
 .../files/gcolor2-0.4-pkg-config-macro.patch   |  4 +--
 x11-misc/gcolor2/files/modular-rgb.patch   |  8 +++---
 x11-misc/gcolor2/gcolor2-0.4-r4.ebuild | 33 --
 4 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-fno-common.patch 
b/x11-misc/gcolor2/files/gcolor2-0.4-fno-common.patch
new file mode 100644
index 000..f30552a13e6
--- /dev/null
+++ b/x11-misc/gcolor2/files/gcolor2-0.4-fno-common.patch
@@ -0,0 +1,27 @@
+--- a/src/callbacks.c
 b/src/callbacks.c
+@@ -13,6 +13,9 @@
+ #include "support.h"
+ 
+ 
++GtkWidget*gcolor2;
++GtkWidget*menu;
++GdkColor  colorvalue;
+ GtkWidget*savedialog;
+ gchar*colorname;
+ static GtkWidget *aboutdialog = NULL;
+--- a/src/callbacks.h
 b/src/callbacks.h
+@@ -42,9 +42,9 @@
+"\302\267 Usability / user interface 
enhancements\n" \
+"\302\267 Code cleanup"
+ 
+-GtkWidget *gcolor2;
+-GtkWidget *menu;
+-GdkColor   colorvalue;
++extern GtkWidget *gcolor2;
++extern GtkWidget *menu;
++extern GdkColor   colorvalue;
+ 
+ enum
+ {

diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch 
b/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch
index ee904746f14..c3fcca0af71 100644
--- a/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch
+++ b/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch
@@ -1,5 +1,5 @@
 configure.ac.old   2008-01-08 09:36:24.0 +0100
-+++ configure.ac   2008-01-08 09:37:06.0 +0100
+--- a/configure.ac
 b/configure.ac
 @@ -26,6 +26,7 @@
  AC_DISABLE_STATIC
  AC_PROG_LIBTOOL

diff --git a/x11-misc/gcolor2/files/modular-rgb.patch 
b/x11-misc/gcolor2/files/modular-rgb.patch
index eec5668c2bc..798fe57e2e3 100644
--- a/x11-misc/gcolor2/files/modular-rgb.patch
+++ b/x11-misc/gcolor2/files/modular-rgb.patch
@@ -1,5 +1,5 @@
 src/callbacks.h.orig   2006-01-10 21:26:19.0 -0500
-+++ src/callbacks.h2006-01-10 21:26:44.0 -0500
+--- a/src/callbacks.h
 b/src/callbacks.h
 @@ -12,6 +12,7 @@
  #define SYSTEM_FILE_2  "/usr/lib/X11/rgb.txt"
  #define SYSTEM_FILE_3  "/etc/X11/rgb.txt"
@@ -8,8 +8,8 @@
  
  /* about dialog text */
  #define ABOUT_CREDITS_TEXT "Developer:\n" \
 src/main.c.orig2006-01-10 21:43:20.0 -0500
-+++ src/main.c 2006-01-10 21:42:14.0 -0500
+--- a/src/main.c
 b/src/main.c
 @@ -36,6 +36,8 @@
sys_filename = SYSTEM_FILE_3;
else if (g_file_test (SYSTEM_FILE_4, G_FILE_TEST_EXISTS))

diff --git a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild 
b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
index 0b164ecf00f..ec842bfb9d4 100644
--- a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
+++ b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
@@ -1,42 +1,45 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG="no"
+EAPI=7
 
-inherit autotools eutils gnome2
+inherit autotools desktop xdg
 
 DESCRIPTION="A GTK+ color selector"
 HOMEPAGE="http://gcolor2.sourceforge.net;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+SRC_URI="
+   mirror://sourceforge/${PN}/${P}.tar.gz
https://dev.gentoo.org/~pacho/gnome/${PN}.svg;
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.4:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
>=dev-util/intltool-0.27
-   virtual/pkgconfig
-"
+   virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/modular-rgb.patch
+   "${FILESDIR}"/${P}-amd64.patch
+   "${FILESDIR}"/${P}-pkg-config-macro.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
-   epatch "${FILESDIR}"/modular-rgb.patch
-   epatch "${FILESDIR}"/${P}-amd64.patch
-   epatch "${FILESDIR}"/${P}-pkg-config-macro.patch
+   xdg_src_prepare
 
# To check at each bump.
sed "s/^#.*/[encoding: UTF-8]/" -i po/POTFILES.in || die "sed failed"
-   echo "gcolor2.glade" >> po/POTFILES.in
+   echo "gcolor2.glade" >> po/POTFILES.in || die
 
eautoreconf
-   gnome2_src_prepare
 }
 
 src_install() {
-   gnome2_src_install
+   default
 
# Icon from https://sourceforge.net/p/gcolor2/patches/5/
doicon -s scalable "${DISTDIR}/${PN}.svg"



[gentoo-commits] repo/gentoo:master commit in: sci-calculators/galculator/, sci-calculators/galculator/files/

2020-11-22 Thread David Seifert
commit: b609d0e3c7853fb915fb8771a4ecb5120d86bdc4
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 22 17:10:40 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 22 17:10:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b609d0e3

sci-calculators/galculator: Port to EAPI 7

* invoking maintainer timeout
* fix spurious test failure
* fix -fno-common

Bug: https://bugs.gentoo.org/566290
Bug: https://bugs.gentoo.org/707170
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../files/galculator-2.1.4-fno-common.patch| 27 +++
 .../galculator/galculator-2.1.4-r1.ebuild  | 39 ++
 2 files changed, 66 insertions(+)

diff --git a/sci-calculators/galculator/files/galculator-2.1.4-fno-common.patch 
b/sci-calculators/galculator/files/galculator-2.1.4-fno-common.patch
new file mode 100644
index 000..32fa609d19c
--- /dev/null
+++ b/sci-calculators/galculator/files/galculator-2.1.4-fno-common.patch
@@ -0,0 +1,27 @@
+From 501a9e3feeb2e56889c0ff98ab6d0ab20348ccd6 Mon Sep 17 00:00:00 2001
+From: Kentaro Hayashi 
+Date: Sat, 1 Aug 2020 22:25:37 +0900
+Subject: [PATCH] Fix multiple definition of `prefs` compile error with GCC-10
+
+This commit fixes the following error:
+
+  libtool: link: gcc -pthread -I/usr/include/gtk-3.0 
-I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 
-I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include 
-I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0 -I/usr/include/cairo 
-I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/harfbuzz 
-I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 
-I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 
-I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libmount -I/usr/include/blkid 
-I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -g -O2 
-fdebug-prefix-map=/workspace/galculator-2.1.4=. -fstack-protector-strong 
-Wformat -Werror=format-security -Wall -Wl,-z -Wl,relro -o galculator 
galculator-main.o galculator-math_functions.o galculator-display.o 
galculator-general_functions.o galculator-calc_basic.o galculator-config_file.o 
galculator-callbacks.o galculator-ui.o galculator-flex_parser.o 
-Wl,--export-dynamic  -Wl,--as-
 needed -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 
-lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
-lquadmath -pthread
+/usr/bin/ld: galculator-config_file.o:./src/config_file.c:42: multiple 
definition of `prefs'; galculator-main.o:./src/main.c:52: first defined here
+  collect2: error: ld returned 1 exit status
+---
+ src/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.c b/src/main.c
+index 10d0868..d22fea0 100644
+--- a/src/main.c
 b/src/main.c
+@@ -49,7 +49,7 @@
+ 
+ #define MASK_NUMLOCK GDK_MOD2_MASK
+ 
+-s_preferences prefs;
++extern s_preferences  prefs;
+ s_current_status  current_status = {0, 0, 0, 0, FALSE, FALSE, TRUE};
+ s_array   memory;
+ s_constant*constant;

diff --git a/sci-calculators/galculator/galculator-2.1.4-r1.ebuild 
b/sci-calculators/galculator/galculator-2.1.4-r1.ebuild
new file mode 100644
index 000..6a7c796d3cf
--- /dev/null
+++ b/sci-calculators/galculator/galculator-2.1.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="GTK+ based algebraic and RPN calculator"
+HOMEPAGE="http://galculator.mnim.org/;
+SRC_URI="http://galculator.mnim.org/downloads/${P}.tar.bz2;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+   dev-libs/glib:2
+   x11-libs/gtk+:3
+   x11-libs/pango"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-util/intltool
+   sys-devel/flex
+   sys-devel/gettext
+   virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+src_prepare() {
+   default
+
+   # bug 566290
+   echo "src/flex_parser.c" >> po/POTFILES.skip || die
+}
+
+src_install() {
+   default
+   dodoc doc/shortcuts
+}



[gentoo-commits] repo/gentoo:master commit in: games-util/etswitch/files/, games-util/etswitch/

2020-11-22 Thread David Seifert
commit: 5a362eb9543216d757cd05899853951968845055
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 22 16:43:50 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 22 16:43:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a362eb9

games-util/etswitch: Port to EAPI 7

Closes: https://bugs.gentoo.org/706950
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 games-util/etswitch/etswitch-0.1.14-r1.ebuild  | 17 +++--
 .../files/etswitch-0.1.14-fno-common.patch | 22 ++
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/games-util/etswitch/etswitch-0.1.14-r1.ebuild 
b/games-util/etswitch/etswitch-0.1.14-r1.ebuild
index da46e7ba497..61b5ce23001 100644
--- a/games-util/etswitch/etswitch-0.1.14-r1.ebuild
+++ b/games-util/etswitch/etswitch-0.1.14-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="*nix minimizer for a few games"
 HOMEPAGE="http://hem.bredband.net/b400150/;
@@ -10,9 +10,9 @@ SRC_URI="http://hem.bredband.net/b400150/${PN}/${P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+   x11-libs/libX11
x11-libs/libXxf86vm
x11-libs/libXmu
x11-libs/libXpm"
@@ -21,10 +21,7 @@ DEPEND="${RDEPEND}
x11-base/xorg-proto"
 
 PATCHES=(
-   "${FILESDIR}"/${P}-desktop-entry.patch
-   "${FILESDIR}"/${P}-glibc.patch
+   "${FILESDIR}"/${P}-desktop-entry.patch
+   "${FILESDIR}"/${P}-glibc.patch
+   "${FILESDIR}"/${P}-fno-common.patch
 )
-
-src_configure() {
-   econf --datadir=/usr/share
-}

diff --git a/games-util/etswitch/files/etswitch-0.1.14-fno-common.patch 
b/games-util/etswitch/files/etswitch-0.1.14-fno-common.patch
new file mode 100644
index 000..f0bdebcb6a7
--- /dev/null
+++ b/games-util/etswitch/files/etswitch-0.1.14-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/src/read_wid.c
 b/src/read_wid.c
+@@ -62,6 +62,8 @@
+ #include 
+ extern int errno;
+ 
++wid_info_struct *wid;
++
+ /*
+ will try and read the wid file and malloc the game struct 
+ if wid file is missing it will read the internal one
+--- a/src/read_wid.h
 b/src/read_wid.h
+@@ -38,7 +38,7 @@
+ char *first_struct;
+ } wid_info_struct;
+ 
+-wid_info_struct *wid; /* global wid array */
++extern wid_info_struct *wid;  /* global wid array */
+ 
+ 
+ 



[gentoo-commits] repo/gentoo:master commit in: games-arcade/xrick/, games-arcade/xrick/files/

2020-11-22 Thread David Seifert
commit: 1073cfb79d527a47ad80625bfd1460e438da6685
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 22 16:43:53 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 22 16:43:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1073cfb7

games-arcade/xrick: Port to EAPI 7

Closes: https://bugs.gentoo.org/707136
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../xrick/files/xrick-021212-Makefile.patch| 30 
 .../xrick/files/xrick-021212-fno-common.patch  | 34 ++
 games-arcade/xrick/xrick-021212-r2.ebuild  | 42 +-
 3 files changed, 89 insertions(+), 17 deletions(-)

diff --git a/games-arcade/xrick/files/xrick-021212-Makefile.patch 
b/games-arcade/xrick/files/xrick-021212-Makefile.patch
new file mode 100644
index 000..2911f4715d4
--- /dev/null
+++ b/games-arcade/xrick/files/xrick-021212-Makefile.patch
@@ -0,0 +1,30 @@
+--- a/Makefile
 b/Makefile
+@@ -71,10 +71,8 @@
+ all:
+   @echo "ROOTDIR=$(ROOTDIR)" > Makefile.global
+   @echo "XOBJ=$(XOBJ)" >> Makefile.global
+-  @echo "CFLAGS=-g -ansi -pedantic -Wall -W -O2 -I $(ROOTDIR)/include 
$(shell sdl-config --cflags)" >> Makefile.global
+-  @echo "LDFLAGS=-lz $(shell sdl-config --libs)" >> Makefile.global
+-  @echo "CC=gcc" >> Makefile.global
+-  @echo "CPP=gcc -E" >> Makefile.global
++  @echo "CFLAGS+=-pedantic -Wall -I$(ROOTDIR)/include $(shell sdl-config 
--cflags)" >> Makefile.global
++  @echo "LIBS+=-lz $(shell sdl-config --libs)" >> Makefile.global
+   $(MAKE) -C src all
+ 
+ clean:
+--- a/src/Makefile
 b/src/Makefile
+@@ -40,10 +40,10 @@
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJECTS) $(XOBJ)
+-  $(CC) $(OBJECTS) $(XOBJ) $(LDFLAGS) -o $(TARGET)
++  $(CC) $(LDFLAGS) $(OBJECTS) $(XOBJ) -o $(TARGET) $(LIBS)
+ 
+ %.o: %.c
+-  $(CC) $(CFLAGS) -c $< -o $@
++  $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ xrick.res: xrick.rc
+   windres $< -O coff -o $@

diff --git a/games-arcade/xrick/files/xrick-021212-fno-common.patch 
b/games-arcade/xrick/files/xrick-021212-fno-common.patch
new file mode 100644
index 000..d3c05c30dbe
--- /dev/null
+++ b/games-arcade/xrick/files/xrick-021212-fno-common.patch
@@ -0,0 +1,34 @@
+--- a/include/img.h
 b/include/img.h
+@@ -27,7 +27,7 @@
+   U8 *pixels;
+ } img_t;
+ 
+-img_t *IMG_SPLASH;
++extern img_t *IMG_SPLASH;
+ 
+ #endif
+ 
+--- a/src/dat_snd.c
 b/src/dat_snd.c
+@@ -19,14 +19,14 @@
+ 
+ sound_t *WAV_WAA;
+ sound_t *WAV_BOMB;
+-sound_t *WAV_BULLET;
+-sound_t *WAV_WALK;
+-sound_t *WAV_JUMP;
++extern sound_t *WAV_BULLET;
++extern sound_t *WAV_WALK;
++extern sound_t *WAV_JUMP;
+ sound_t *WAV_TING;
+-sound_t *WAV_BOMBSHHT;
+-sound_t *WAV_BONUS;
++extern sound_t *WAV_BOMBSHHT;
++extern sound_t *WAV_BONUS;
+ sound_t *WAV_SHHT;
+-sound_t *WAV_BOX;
++extern sound_t *WAV_BOX;
+ sound_t *WAV_DDDING;
+ 
+ #endif /* ENABLE_SOUND */

diff --git a/games-arcade/xrick/xrick-021212-r2.ebuild 
b/games-arcade/xrick/xrick-021212-r2.ebuild
index c24058e2784..3ef05387653 100644
--- a/games-arcade/xrick/xrick-021212-r2.ebuild
+++ b/games-arcade/xrick/xrick-021212-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Clone of the Rick Dangerous adventure game from the 80's"
 HOMEPAGE="http://www.bigorno.net/xrick/;
@@ -11,44 +12,51 @@ SRC_URI="http://www.bigorno.net/xrick/${P}.tgz;
 LICENSE="GPL-1+ xrick"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 RESTRICT="mirror bindist" # bug #149097
 
 DEPEND="media-libs/libsdl[video]"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-exit.patch
+   "${FILESDIR}"/${P}-fullscreen.patch
+   "${FILESDIR}"/${P}-zlib.patch
+   "${FILESDIR}"/${P}-Makefile.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+)
+
 src_unpack() {
unpack ${A}
-   cd "${S}"
+   cd "${S}" || die
unpack ./xrick.6.gz
 }
 
 src_prepare() {
default
-   eapply "${FILESDIR}"/${P}*.patch
+
sed -i \
-e "/^run from/d" \
-   -e "/data.zip/ s:the directory where xrick 
is:$(get_libdir)/${PN}.:" \
+   -e "/data.zip/ s:the directory where xrick 
is:$(get_libdir)/xrick.:" \
xrick.6 || die
 
sed -i \
-   -e "s:data.zip:/usr/$(get_libdir)/${PN}/data.zip:" \
+   -e "s:data.zip:${EPREFIX}/usr

[gentoo-commits] repo/gentoo:master commit in: games-sports/bygfoot/files/, games-sports/bygfoot/

2020-11-22 Thread David Seifert
commit: 1ca14cc34b96ee959fd35bf5732c351d6dad0acf
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 22 16:43:56 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 22 16:43:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ca14cc3

games-sports/bygfoot: Port to EAPI 7

Closes: https://bugs.gentoo.org/707646
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 games-sports/bygfoot/bygfoot-2.3.2-r1.ebuild   |  27 +-
 .../bygfoot/files/bygfoot-2.3.2-Makefile.patch |  57 +++
 .../bygfoot/files/bygfoot-2.3.2-fno-common.patch   | 496 +
 3 files changed, 565 insertions(+), 15 deletions(-)

diff --git a/games-sports/bygfoot/bygfoot-2.3.2-r1.ebuild 
b/games-sports/bygfoot/bygfoot-2.3.2-r1.ebuild
index 9ed990aea67..6a48c782429 100644
--- a/games-sports/bygfoot/bygfoot-2.3.2-r1.ebuild
+++ b/games-sports/bygfoot/bygfoot-2.3.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils vcs-clean
+inherit desktop vcs-clean
 
 DESCRIPTION="GTK+2 Soccer Management Game"
 HOMEPAGE="http://bygfoot.sourceforge.net/;
@@ -12,35 +12,32 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
app-arch/zip
media-libs/freetype:2
x11-libs/gtk+:2
virtual/libintl"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-devel/gettext
virtual/pkgconfig"
 
-src_prepare() {
-   default
-
-   sed -i \
-   -e 's:$(gnulocaledir):/usr/share/locale:' \
-   -e 
'/PACKAGE_LOCALE_DIR/s:\$(prefix)/\$(DATADIRNAME):/usr/share:' \
-   -e '/bygfoot_LDADD/s/$/ -lm/' \
-   po/Makefile.in.in src/Makefile.in || die
-}
+PATCHES=(
+   "${FILESDIR}"/${P}-Makefile.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_configure() {
econf --disable-gstreamer
 }
 
 src_install() {
-   emake DESTDIR="${D}" install
+   default
+   dodoc UPDATE
+
esvn_clean "${D}"
-   dodoc AUTHORS ChangeLog README TODO UPDATE
+
newicon support_files/pixmaps/bygfoot_icon.png ${PN}.png
make_desktop_entry ${PN} Bygfoot
 }

diff --git a/games-sports/bygfoot/files/bygfoot-2.3.2-Makefile.patch 
b/games-sports/bygfoot/files/bygfoot-2.3.2-Makefile.patch
new file mode 100644
index 000..306428a5005
--- /dev/null
+++ b/games-sports/bygfoot/files/bygfoot-2.3.2-Makefile.patch
@@ -0,0 +1,57 @@
+--- a/po/Makefile.in.in
 b/po/Makefile.in.in
+@@ -28,7 +28,7 @@
+ datarootdir = @datarootdir@
+ datadir = @datadir@
+ libdir = @libdir@
+-localedir = $(libdir)/locale
++localedir = @localedir@
+ gnulocaledir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+ subdir = po
+@@ -129,7 +129,6 @@
+   for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+ case "$$cat" in \
+-  *.gmo) destdir=$(gnulocaledir);; \
+   *) destdir=$(localedir);; \
+ esac; \
+ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+@@ -183,8 +182,6 @@
+ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ rm -f 
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+ rm -f 
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+-rm -f 
$(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+-rm -f 
$(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; 
\
+   done
+   if test "$(PACKAGE)" = "glib"; then \
+ rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+--- a/src/Makefile.in
 b/src/Makefile.in
+@@ -206,7 +206,7 @@
+ AM_CFLAGS = -Wall #-fprofile-arcs -ftest-coverage -pg
+ INCLUDES = \
+   -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+-  -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
++  -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
+   @PACKAGE_CFLAGS@ @GST_CFLAGS@
+ 
+ bygfoot_SOURCES = \
+@@ -289,7 +289,7 @@
+   xml_team.c file.h free.h main.h misc.h option.h player.h team.h 
variables.h xml_team.h \
+   youth_academy.c free.h maths.h name.h option.h player.h team.h user.h 
youth_academy.h 
+ 
+-bygfoot_LDADD = @PACKAGE_LIBS@ @GST_LIBS@ $(INTLLIBS) 
++bygfoot_LDADD = @PACKAGE_LIBS@ @GST_LIBS@ $(INTLLIBS) -lm
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -348,7 +348,7 @@
+   -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ bygfoot$(EXEEXT): $(bygfoot_OBJECTS) $(bygfoot_DEPENDENCIES) 
+   @rm -f bygfoot$(EXEEXT)
+-  $(LINK) $(bygfoot_OBJECTS) $(bygfoot_LD

[gentoo-commits] repo/gentoo:master commit in: profiles/

2020-11-22 Thread David Seifert
commit: 9f49e151739b6ab6d563def0dea34a07ccdfeb18
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 22 15:08:36 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 22 15:08:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f49e151

package.mask: Last-rite games-emulation/fakenes

Bug: https://bugs.gentoo.org/293567
Bug: https://bugs.gentoo.org/670954
Bug: https://bugs.gentoo.org/697444
Bug: https://bugs.gentoo.org/699320
Bug: https://bugs.gentoo.org/708058
Bug: https://bugs.gentoo.org/746230
Signed-off-by: David Seifert  gentoo.org>

 profiles/package.mask | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 7c120c93c8d..2ed96694d09 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,12 @@
 
 #--- END OF EXAMPLES ---
 
+# David Seifert  (2020-11-22)
+# Upstream abandoned since 2012, tons of QA issues and
+# build bugs, esoteric NIH build system. Bug #293567, #670954,
+# #697444, #699320, #708058, #746230, Removal in 30 days.
+games-emulation/fakenes
+
 # Joonas Niilola  (2020-11-22)
 # Abandoned upstream, unbuildable, unkeyworded in ::gentoo. 
 # Removal in 14 days. Bug #https://bugs.gentoo.org/752456



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/maui/, sys-cluster/maui/files/, profiles/

2020-11-22 Thread David Seifert
commit: 23c2fcae268d01a7bcb593febcd963875a822b7c
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 22 14:54:12 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 22 14:54:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23c2fcae

sys-cluster/maui: Remove last-rited package

Closes: https://bugs.gentoo.org/365713
Closes: https://bugs.gentoo.org/405277
Closes: https://bugs.gentoo.org/405437
Closes: https://bugs.gentoo.org/414793
Closes: https://bugs.gentoo.org/415699
Closes: https://bugs.gentoo.org/422799
Closes: https://bugs.gentoo.org/479288
Closes: https://bugs.gentoo.org/740928
Signed-off-by: David Seifert  gentoo.org>

 profiles/package.mask|  6 ---
 sys-cluster/maui/Manifest|  1 -
 sys-cluster/maui/files/maui-3.3.1-torque_4.patch | 14 --
 sys-cluster/maui/files/maui.initd| 23 -
 sys-cluster/maui/maui-3.3.1-r3.ebuild| 61 
 sys-cluster/maui/metadata.xml| 12 -
 6 files changed, 117 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index e6079ae1e84..269c438bcc6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -408,12 +408,6 @@ dev-perl/ZMQ-LibZMQ2
 # bug #654244, #740952, #726912, #723060
 dev-lang/j
 
-# David Seifert  (2020-10-24)
-# EAPI 4, fetch restricted, download link disappeared, fails to build.
-# Removal in 30 days. Bug #365713, #405277, #405437, #414793, #415699,
-# #422799, #479288, #740928.
-sys-cluster/maui
-
 # David Seifert  (2020-10-24)
 # EAPI 4, abandoned upstream, fails to build, security vulnerabilities.
 # .NET is practically abandoned in Gentoo and needs a complete reboot.

diff --git a/sys-cluster/maui/Manifest b/sys-cluster/maui/Manifest
deleted file mode 100644
index 2b74152b500..000
--- a/sys-cluster/maui/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST maui-3.3.1.tar.gz 901179 BLAKE2B 
57c207c3760b929140ccf998532131d2a879278cb47218a673cba1dda67f8d77180eadaf72c6bbf4c0917db78de5301f851324980917d772d9b955e551ad16f2
 SHA512 
e22a0f08b40d810792175b5bc15a53831e84eeab43ddc79ebc3e10a2d5c0b77a4634ff67975f9dae06fbb84f84cb3a95e9cbfcb8086734dbd41caee3359675b0

diff --git a/sys-cluster/maui/files/maui-3.3.1-torque_4.patch 
b/sys-cluster/maui/files/maui-3.3.1-torque_4.patch
deleted file mode 100644
index 1e063155573..000
--- a/sys-cluster/maui/files/maui-3.3.1-torque_4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur maui-3.3.1.orig/src/moab/MPBSI.c maui-3.3.1/src/moab/MPBSI.c
 maui-3.3.1.orig/src/moab/MPBSI.c  2013-07-31 09:36:31.831849229 -0700
-+++ maui-3.3.1/src/moab/MPBSI.c   2013-07-31 09:37:12.951107957 -0700
-@@ -174,8 +174,8 @@
- 
- extern int pbs_errno; 
- 
--extern int get_svrport(const char *,char *,int);
--extern int openrm(char *,int);
-+extern unsigned int get_svrport(char *,char *,unsigned int);
-+extern int openrm(char *,unsigned int);
- extern int addreq(int,char *);
- extern int closerm(int);
- extern int pbs_stagein(int,char *,char *,char *);

diff --git a/sys-cluster/maui/files/maui.initd 
b/sys-cluster/maui/files/maui.initd
deleted file mode 100644
index df4f64474f1..000
--- a/sys-cluster/maui/files/maui.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-need net
-after pbs_server slurmctld
-before pbs_mom slurmd
-after logger
-}
-
-start() {
-ebegin "Starting Maui scheduler"
-start-stop-daemon --start --exec /usr/sbin/maui 
-eend ${?}  
-}
-
-stop() {
-ebegin "Stopping Maui scheduler"
-start-stop-daemon --stop -p /var/spool/maui/maui.pid
-eend ${?}
-}
-# vim:ts=4

diff --git a/sys-cluster/maui/maui-3.3.1-r3.ebuild 
b/sys-cluster/maui/maui-3.3.1-r3.ebuild
deleted file mode 100644
index 82459ce3849..000
--- a/sys-cluster/maui/maui-3.3.1-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="Maui Cluster Scheduler"
-HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/maui/;
-SRC_URI="http://www.adaptivecomputing.com/download/${PN}/${P}.tar.gz;
-
-LICENSE="maui"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="pbs slurm"
-
-REQUIRED_USE="^^ ( pbs slurm )"
-
-DEPEND="
-   pbs? ( >=sys-cluster/torque-4 )
-   slurm? ( sys-cluster/slurm )"
-RDEPEND="${DEPEND}"
-
-RESTRICT="fetch mirror"
-
-pkg_setup() {
-   if use slurm; then
-   if [ -z ${MAUI_KEY} ]; then
-   eerror "You should set MAUI_KEY to any integer value in 
make.conf"
-   return 1
- 

[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-dotnet/log4net/files/, dev-dotnet/log4net/

2020-11-22 Thread David Seifert
commit: e7c2bcaa05065b4502abc500f56225b18e78aafb
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 22 14:54:21 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 22 14:54:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c2bcaa

dev-dotnet/log4net: Remove last-rited package

Closes: https://bugs.gentoo.org/722256
Closes: https://bugs.gentoo.org/740990
Signed-off-by: David Seifert  gentoo.org>

 dev-dotnet/log4net/Manifest   |  2 --
 dev-dotnet/log4net/files/log4net.pc.in-r1 |  8 --
 dev-dotnet/log4net/log4net-1.2.11.ebuild  | 44 ---
 dev-dotnet/log4net/metadata.xml   |  8 --
 profiles/package.mask |  6 -
 5 files changed, 68 deletions(-)

diff --git a/dev-dotnet/log4net/Manifest b/dev-dotnet/log4net/Manifest
deleted file mode 100644
index d6e4677e7f2..000
--- a/dev-dotnet/log4net/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST log4net-1.2.11-src.zip 1208854 BLAKE2B 
82906395d9ed5aedacc8e86ce862aef55a91e98aaedf9c4558f9a4aa749ff59b689a2e0658ddc8287b919b8e2d8a1a544f477b85016dab4e48da899fce143f24
 SHA512 
b6ad8c873de69a30c68c82265dd2a5de331ecb780896f750088fe1e91f17191c2b54850629ece26659ec4c72b695cccae48eae30dbdf4dd18d5545cc24a42865
-DIST log4net.snk 596 BLAKE2B 
d83b91d9601d89bd4120d9543b893701b62193e93c1947051f8283eae9b2d7759fa372d349a95de55255dcee83039c983124a90f77d1830ae82e31141f3dca74
 SHA512 
b0525adfe90b8d86c7e7ac8295097b60b03b427aa4e6ad36b32bb98c7bc9fc081158249285c42eeff7637bd66a742ca422906a85544ca6526fe5e785cead8ff7

diff --git a/dev-dotnet/log4net/files/log4net.pc.in-r1 
b/dev-dotnet/log4net/files/log4net.pc.in-r1
deleted file mode 100644
index 262850fc1e4..000
--- a/dev-dotnet/log4net/files/log4net.pc.in-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/@LIBDIR@
-
-Name: Log4net
-Description: Log4net - Logging library for C# and VB.NET
-Version: @VERSION@
-Libs: -r:${libdir}/mono/log4net/log4net.dll

diff --git a/dev-dotnet/log4net/log4net-1.2.11.ebuild 
b/dev-dotnet/log4net/log4net-1.2.11.ebuild
deleted file mode 100644
index 1f1d7f15db3..000
--- a/dev-dotnet/log4net/log4net-1.2.11.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils mono multilib versionator
-
-PV_MAJOR=$(get_version_component_range 1-2)
-
-DESCRIPTION="tool to help the programmer output log statements to a variety of 
output targets"
-HOMEPAGE="http://logging.apache.org/log4net/;
-SRC_URI="mirror://apache/logging/log4net/source/${P}-src.zip
-   https://dev.gentoo.org/~pacho/dotnet/log4net.snk;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/mono-2.0"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-   /usr/bin/mcs \
-   -t:library \
-   -out:log4net.dll \
-   -keyfile:"${DISTDIR}"/log4net.snk \
-   -r:System.Data \
-   -r:System.Web \
-   $(find src -name "*.cs") || die
-}
-
-src_install() {
-   egacinstall log4net.dll
-   dodir /usr/$(get_libdir)/pkgconfig
-   sed -e "s:@VERSION@:${PV}:" \
-   -e "s:@LIBDIR@:$(get_libdir):" \
-   -e "s:@NET_VERSION@:2.0:" \
-   "${FILESDIR}"/${PN}.pc.in-r1 > 
"${D}"/usr/$(get_libdir)/pkgconfig/${PN}-${PV}.pc
-   dosym ${PN}-${PV}.pc /usr/$(get_libdir)/pkgconfig/${PN}-${PV_MAJOR}.pc
-   dosym ${PN}-${PV}.pc /usr/$(get_libdir)/pkgconfig/${PN}.pc
-
-   dodoc README.txt STATUS.txt
-}

diff --git a/dev-dotnet/log4net/metadata.xml b/dev-dotnet/log4net/metadata.xml
deleted file mode 100644
index c99669dda12..000
--- a/dev-dotnet/log4net/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-
-   dot...@gentoo.org
-   Gentoo Dotnet Project
-
-

diff --git a/profiles/package.mask b/profiles/package.mask
index a1d3df30550..7c120c93c8d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -408,12 +408,6 @@ dev-perl/ZMQ-LibZMQ2
 # bug #654244, #740952, #726912, #723060
 dev-lang/j
 
-# David Seifert  (2020-10-24)
-# EAPI 4, abandoned upstream, fails to build, security vulnerabilities.
-# .NET is practically abandoned in Gentoo and needs a complete reboot.
-# Removal in 30 days. Bug #681194, #722256, #740986, #740988, #740990.
-dev-dotnet/log4net
-
 # Michał Górny  (2020-10-24)
 # Last release in 2004, next release 'Soon(tm)'.  Fails to build
 # due to horrible code hacks.



[gentoo-commits] repo/gentoo:master commit in: sys-power/nvram-wakeup/files/, sys-power/nvram-wakeup/, profiles/

2020-11-22 Thread David Seifert
commit: 1a59c270a9b0a7d45d25b7541d88c2753d078033
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 22 14:54:06 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 22 14:54:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a59c270

sys-power/nvram-wakeup: Remove last-rited package

Closes: https://bugs.gentoo.org/124755
Closes: https://bugs.gentoo.org/713472
Closes: https://bugs.gentoo.org/726020
Closes: https://bugs.gentoo.org/740912
Closes: https://bugs.gentoo.org/742434
Signed-off-by: David Seifert  gentoo.org>

 profiles/package.mask  |  6 --
 sys-power/nvram-wakeup/Manifest|  1 -
 .../files/nvram-wakeup-0.97-nonls.patch| 18 --
 sys-power/nvram-wakeup/metadata.xml| 11 
 sys-power/nvram-wakeup/nvram-wakeup-1.1.ebuild | 73 --
 5 files changed, 109 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index c61f0b011d7..644c2addf8f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -408,12 +408,6 @@ dev-perl/ZMQ-LibZMQ2
 # bug #654244, #740952, #726912, #723060
 dev-lang/j
 
-# David Seifert  (2020-10-24)
-# EAPI 4, multiple QA issues, performs dangerous pointer-to-int
-# casts, can trash your computer, last release over 10 years ago.
-# Removal in 30 days. Bug #124755, #713472, #726020, #740912, #742434.
-sys-power/nvram-wakeup
-
 # David Seifert  (2020-10-24)
 # EAPI 4, doesn't build, outdated, ebuild has multiple QA issues.
 # Removal in 30 days. Bug #463188, #531104, #613116, #740926.

diff --git a/sys-power/nvram-wakeup/Manifest b/sys-power/nvram-wakeup/Manifest
deleted file mode 100644
index 063de424d8a..000
--- a/sys-power/nvram-wakeup/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nvram-wakup-1.1.tar.gz 1070097 BLAKE2B 
9e9aad545d7a7d0882cf07522c60a68ab678ad2dec8ba51828862afe077fa5a11929aaf5a21bae69977338fdf1de5cb394a874475dcc8b4018c4358e780fe786
 SHA512 
a47c6831e004e25f43adbc25aa46aca457602c681693621e3acda12f1f775aa1c5fa30ec9a09d71945ef2de8a2dbe97f9c1c7e09b1ae3464c368c9b8fc0f11e0

diff --git a/sys-power/nvram-wakeup/files/nvram-wakeup-0.97-nonls.patch 
b/sys-power/nvram-wakeup/files/nvram-wakeup-0.97-nonls.patch
deleted file mode 100644
index 108d02eddd2..000
--- a/sys-power/nvram-wakeup/files/nvram-wakeup-0.97-nonls.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 nvram-wakeup-0.97/Makefile
-+++ nvram-wakeup-0.97/Makefile
-@@ -41,3 +41,3 @@
- 
--all: $(BINS) $(GTTXT)
-+all: $(BINS)
-   size $(BINS)
-@@ -88,3 +88,2 @@
-   @$(INSTALL) -vd $(DOCDIR)
--  @$(INSTALL) -vd $(GTTXTDIR)
-   @$(INSTALL) -vm 755 $(PROG_SH)$(BINDIR)
-@@ -94,3 +93,2 @@
-   @$(INSTALL) -vm 644 $(DOC)$(DOCDIR)
--  @$(INSTALL) -vm 755 $(GTTXT)  $(GTTXTDIR)
- 
-@@ -110,2 +108 @@
-   cd $(DOCDIR); rm -f $(DOC)
--  cd $(GTTXTDIR); rm -f $(GTTXT)

diff --git a/sys-power/nvram-wakeup/metadata.xml 
b/sys-power/nvram-wakeup/metadata.xml
deleted file mode 100644
index 0b3a391b3d5..000
--- a/sys-power/nvram-wakeup/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-
-   base-sys...@gentoo.org
-   Gentoo Base System
-
-
-   nvram-wakeup
-
-

diff --git a/sys-power/nvram-wakeup/nvram-wakeup-1.1.ebuild 
b/sys-power/nvram-wakeup/nvram-wakeup-1.1.ebuild
deleted file mode 100644
index 48e4da2acae..000
--- a/sys-power/nvram-wakeup/nvram-wakeup-1.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit flag-o-matic eutils
-
-MY_P=${P%_p*}
-[[ ${PV} == *_p* ]] && REV=${P#*_p} || unset REV
-MY_P=${MY_P/e}
-DESCRIPTION="read and write the WakeUp time in the BIOS"
-HOMEPAGE="https://sourceforge.net/projects/nvram-wakeup;
-SRC_URI="mirror://sourceforge/nvram-wakeup/${MY_P}.tar.gz
-   
${REV+http://nvram-wakeup.svn.sourceforge.net/viewvc/*checkout*/nvram-wakeup/trunk/nvram-wakeup/nvram-wakeup-mb.c?revision=${REV}};
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-[[ -n ${REV} ]] && RESTRICT="mirror" #168114
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-   unpack ${MY_P}.tar.gz
-   if [[ -n ${REV} ]] ; then
-   cp "${DISTDIR}"/nvram-wakeup-mb.c?revision=${REV} 
"${S}"/nvram-wakeup-mb.c || die
-   fi
-}
-
-src_prepare() {
-   use nls || epatch "${FILESDIR}"/${PN}-0.97-nonls.patch
-   # Need to be careful with CFLAGS since this could eat your bios
-   strip-flags
-   # GTTXT mode fix
-   sed -i \
-   -e '/^CFLAGS/s:= -O2 :+= $(CPPFLAGS) :' \
-   -e '/GTTXT/s:755:644:' \
-   Makefile || die
-}
-
-src_

[gentoo-commits] repo/gentoo:master commit in: profiles/, sci-electronics/alliance/files/, sci-electronics/alliance/

2020-11-22 Thread David Seifert
commit: ced06e132ed39f78712c8e577d47684dfdb47022
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 22 14:54:03 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 22 14:54:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced06e13

sci-electronics/alliance: Remove last-rited package

Closes: https://bugs.gentoo.org/625118
Closes: https://bugs.gentoo.org/725438
Closes: https://bugs.gentoo.org/746029
Signed-off-by: David Seifert  gentoo.org>

 profiles/package.mask  |   6 --
 sci-electronics/alliance/Manifest  |   1 -
 .../alliance/alliance-5.0.20110203.ebuild  |  63 ---
 .../files/alliance-5.0.20070718-overun.patch   |  12 ---
 .../files/alliance-5.0.20110203-impl-dec.patch | 119 -
 sci-electronics/alliance/metadata.xml  |  18 
 6 files changed, 219 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 6dc26c50c30..c61f0b011d7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -408,12 +408,6 @@ dev-perl/ZMQ-LibZMQ2
 # bug #654244, #740952, #726912, #723060
 dev-lang/j
 
-# David Seifert  (2020-10-24)
-# EAPI 4, broken since 2012, upstream disappeared, multiple QA issues,
-# build system is completely broken. Removal in 30 days,
-# Bug #625118, #725438, #746029.
-sci-electronics/alliance
-
 # David Seifert  (2020-10-24)
 # EAPI 4, multiple QA issues, performs dangerous pointer-to-int
 # casts, can trash your computer, last release over 10 years ago.

diff --git a/sci-electronics/alliance/Manifest 
b/sci-electronics/alliance/Manifest
deleted file mode 100644
index 1e44e70d2d2..000
--- a/sci-electronics/alliance/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST alliance-5.0-20110203.tar.gz 8112254 BLAKE2B 
77c81348f432f2b424c2cff3ff188bec72e9ba7bb31a91a6b9d63ec3b0a61848f4dd2246ddcfdf0bf4199423ffedcc62ac6beac8ca52ece345ce6ebb4f05
 SHA512 
03859d4d5167c223c2af9784843303a46d9a47e7fb26c2dadd60361b6735f6afb75c3097460dd804ef339c72f2bf0f60e78713be88d2c5ad06ad8b0c376857c8

diff --git a/sci-electronics/alliance/alliance-5.0.20110203.ebuild 
b/sci-electronics/alliance/alliance-5.0.20110203.ebuild
deleted file mode 100644
index aa8045c61de..000
--- a/sci-electronics/alliance/alliance-5.0.20110203.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit versionator flag-o-matic eutils
-
-MY_PV=$(replace_version_separator 2 '-' )
-UPSTREAM_VERSION=$(get_version_component_range 1-2)
-URL="http://www-asim.lip6.fr/pub/alliance/distribution/${UPSTREAM_VERSION};
-
-DESCRIPTION="Digital IC design tools (simulation, synthesis, place/route, 
etc...)"
-HOMEPAGE="https://soc-extras.lip6.fr/en/alliance-abstract-en/;
-SRC_URI="${URL}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=x11-libs/motif-2.3:0
-   x11-libs/libXpm
-   x11-libs/libXt"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${UPSTREAM_VERSION}"
-
-src_prepare() {
-   #fix buffer overrun (bug 340789)
-   epatch \
-   "${FILESDIR}"/${PN}-${UPSTREAM_VERSION}.20070718-overun.patch \
-   "${FILESDIR}"/${P}-impl-dec.patch
-}
-
-src_configure() {
-   # Fix bug #134285
-   replace-flags -O3 -O2
-
-   # Alliance requires everything to be in the same directory
-   econf \
-   --prefix=/usr/lib/${PN} \
-   --mandir=/usr/lib/${PN}/man \
-   --with-x \
-   --with-motif \
-   --with-xpm \
-   --with-alc-shared
-}
-
-src_compile() {
-   # See bug #134145
-   emake -j1
-}
-
-src_install() {
-   make install DESTDIR="${D}"
-   insinto /etc
-   newins distrib/etc/alc_env.sh alliance.env
-}
-
-pkg_postinst() {
-   elog "Users should source /etc/alliance.env before working with 
Alliance tools."
-}

diff --git a/sci-electronics/alliance/files/alliance-5.0.20070718-overun.patch 
b/sci-electronics/alliance/files/alliance-5.0.20070718-overun.patch
deleted file mode 100644
index 50cfc30be23..000
--- a/sci-electronics/alliance/files/alliance-5.0.20070718-overun.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# fix buffer overun (bug 340789)
 druc/src/drucbath.c.orig   2010-10-15 14:15:52.0 +
-+++ druc/src/drucbath.c2010-10-15 14:19:03.0 +
-@@ -66,7 +66,7 @@
- rdsins_list *InstanceCourante;
- char*TmpErrorFileName;
- FILE*TmpErrorFile;
--char DrucTmpFileBuffer [ DRUC_MAX_STRING_BUFFER + 1 ];
-+char DrucTmpFileBuffer [ DRUC_MAX_FILE_BUFFER + 1 ];
- 
-   fputs ( "\n" ,
-   DrucErrorFile 

diff --git 
a/sci-electronics/alliance/files/a

[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-dotnet/ikvm-bin/, dev-dotnet/ikvm-bin/files/

2020-11-22 Thread David Seifert
commit: c221446a32b401d3cd234572899302e9f6231527
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 22 14:54:18 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 22 14:54:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c221446a

dev-dotnet/ikvm-bin: Remove last-rited package

Closes: https://bugs.gentoo.org/740988
Signed-off-by: David Seifert  gentoo.org>

 dev-dotnet/ikvm-bin/Manifest   |  1 -
 dev-dotnet/ikvm-bin/files/ikvm-0.36.0.5.pc.in  |  9 -
 dev-dotnet/ikvm-bin/ikvm-bin-7.1.4532.2.ebuild | 50 --
 dev-dotnet/ikvm-bin/metadata.xml   |  8 -
 profiles/package.mask  |  1 -
 5 files changed, 69 deletions(-)

diff --git a/dev-dotnet/ikvm-bin/Manifest b/dev-dotnet/ikvm-bin/Manifest
deleted file mode 100644
index ae8358f3dd9..000
--- a/dev-dotnet/ikvm-bin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ikvmbin-7.1.4532.2.zip 16391340 BLAKE2B 
c318f2e09d11efacb2e3591df998912a8ce1159ccadc22f1457bf13077367908fb7104b9d49cc0b42516e59e01a07e8ad033720034b2b5fac197d6e9c675f896
 SHA512 
a447473741541e13b6723feef7f474a01670d885ffbfd68269b121cfb39658ca0189f30e055b811f7c72e320b7a28e115b2b858679c43b55b86f00a1429ecdae

diff --git a/dev-dotnet/ikvm-bin/files/ikvm-0.36.0.5.pc.in 
b/dev-dotnet/ikvm-bin/files/ikvm-0.36.0.5.pc.in
deleted file mode 100644
index aaf131f3531..000
--- a/dev-dotnet/ikvm-bin/files/ikvm-0.36.0.5.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/@LIBDIR@
-
-
-Name: IKVM.NET
-Description: An implementation of Java for Mono and the Microsoft .NET 
Framework.
-Version: @VERSION@
-Libs: -r:${libdir}/ikvm/IKVM.Runtime.dll 
-r:${libdir}/ikvm/IKVM.OpenJDK.ClassLibrary.dll 
-r:${libdir}/ikvm/IKVM.AWT.WinForms.dll

diff --git a/dev-dotnet/ikvm-bin/ikvm-bin-7.1.4532.2.ebuild 
b/dev-dotnet/ikvm-bin/ikvm-bin-7.1.4532.2.ebuild
deleted file mode 100644
index c902020f633..000
--- a/dev-dotnet/ikvm-bin/ikvm-bin-7.1.4532.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils mono multilib
-
-MY_P=${P/-bin/}
-MY_PN=${PN/-bin/}
-
-DESCRIPTION="Java VM for .NET"
-HOMEPAGE="http://www.ikvm.net/ http://weblog.ikvm.net/;
-SRC_URI="http://www.frijters.net/${MY_PN}bin-${PV}.zip;
-LICENSE="ZLIB GPL-2-with-linking-exception"
-
-SLOT="0"
-S=${WORKDIR}/${MY_P}
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-lang/mono-1.1
-   !dev-dotnet/ikvm
-   app-arch/unzip"
-RDEPEND="${DEPEND}"
-
-src_install() {
-   insinto /usr/$(get_libdir)/${MY_PN}
-   doins bin/*
-
-   for exe in ikvm ikvmc ikvmstub;
-   do
-   make_wrapper ${exe} "mono 
/usr/$(get_libdir)/${MY_PN}/${exe}.exe" || die
-   done
-
-   dodir /usr/$(get_libdir)/pkgconfig
-   sed -e "s:@VERSION@:${PV}:" \
-   -e "s:@LIBDIR@:$(get_libdir):" \
-   "${FILESDIR}"/ikvm-0.36.0.5.pc.in > 
"${D}"/usr/$(get_libdir)/pkgconfig/${MY_PN}.pc \
-   || die "sed failed"
-
-   for dll in bin/IKVM*.dll
-   do
-   dllbase=${dll##*/}
-   ebegin "Installing and registering ${dllbase}"
-   gacutil -i bin/${dllbase} -root "${D}"/usr/$(get_libdir) \
-   -gacdir /usr/$(get_libdir) -package IKVM &>/dev/null
-   eend $? || die "Failed installing ${dllbase}"
-   done
-}

diff --git a/dev-dotnet/ikvm-bin/metadata.xml b/dev-dotnet/ikvm-bin/metadata.xml
deleted file mode 100644
index 1e9986c4a0c..000
--- a/dev-dotnet/ikvm-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-   
-   dot...@gentoo.org
-   Gentoo Dotnet Project
-   
-

diff --git a/profiles/package.mask b/profiles/package.mask
index 0a11eb02044..a1d3df30550 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -412,7 +412,6 @@ dev-lang/j
 # EAPI 4, abandoned upstream, fails to build, security vulnerabilities.
 # .NET is practically abandoned in Gentoo and needs a complete reboot.
 # Removal in 30 days. Bug #681194, #722256, #740986, #740988, #740990.
-dev-dotnet/ikvm-bin
 dev-dotnet/log4net
 
 # Michał Górny  (2020-10-24)



[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-dotnet/gio-sharp/

2020-11-22 Thread David Seifert
commit: 04de4fb5dc2d2da76dcba3b5decaca041625c567
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 22 14:54:15 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 22 14:54:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04de4fb5

dev-dotnet/gio-sharp: Remove last-rited package

Closes: https://bugs.gentoo.org/681194
Closes: https://bugs.gentoo.org/740986
Signed-off-by: David Seifert  gentoo.org>

 dev-dotnet/gio-sharp/Manifest|  1 -
 dev-dotnet/gio-sharp/gio-sharp-0.3-r1.ebuild | 41 
 dev-dotnet/gio-sharp/metadata.xml| 11 
 profiles/package.mask|  1 -
 4 files changed, 54 deletions(-)

diff --git a/dev-dotnet/gio-sharp/Manifest b/dev-dotnet/gio-sharp/Manifest
deleted file mode 100644
index a594331bff0..000
--- a/dev-dotnet/gio-sharp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gio-sharp-0.3.tar.gz 89752 BLAKE2B 
8c2ff7ec2fa1491d3fa4a3b8c8abe39dffe18f7f59a8866575cab298e84a5f5404467d02480e617d22214eb48bca0f70b7fb60b1a87aa91c36f970444edbcd8a
 SHA512 
69a3e5db422403fa756a25818a7db5adcf6c1bef81b1f10ce5dc4bdb63ea1462c3a9ea4a4f987b0e30dc99258c1aac279005d045c8709187bae7f095a66a

diff --git a/dev-dotnet/gio-sharp/gio-sharp-0.3-r1.ebuild 
b/dev-dotnet/gio-sharp/gio-sharp-0.3-r1.ebuild
deleted file mode 100644
index 08a813517c3..000
--- a/dev-dotnet/gio-sharp/gio-sharp-0.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools mono-env
-
-DESCRIPTION="GIO API C# binding"
-HOMEPAGE="https://github.com/mono/gio-sharp;
-SRC_URI="https://github.com/mono/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-dotnet/gtk-sharp-2.12.21
-   >=dev-libs/glib-2.22:2"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-pkg_setup() {
-   DOCS="AUTHORS NEWS README"
-   mono-env_pkg_setup
-}
-
-src_unpack() {
-   unpack ${A}
-   mv *-${PN}-* "${S}"
-}
-
-src_prepare() {
-   sed -i -e 's/gmcs/mcs/' configure.ac.in || die
-   sed -i -e '/autoreconf/d' autogen-generic.sh || die
-   NOCONFIGURE=1 ./autogen-2.22.sh || die
-
-   eautoreconf
-}
-
-src_compile() {
-   emake -j1
-}

diff --git a/dev-dotnet/gio-sharp/metadata.xml 
b/dev-dotnet/gio-sharp/metadata.xml
deleted file mode 100644
index 89d6dbfb280..000
--- a/dev-dotnet/gio-sharp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-  
-dot...@gentoo.org
-Gentoo Dotnet Project
-  
-  
-mono/gio-sharp
-  
-

diff --git a/profiles/package.mask b/profiles/package.mask
index 269c438bcc6..0a11eb02044 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -412,7 +412,6 @@ dev-lang/j
 # EAPI 4, abandoned upstream, fails to build, security vulnerabilities.
 # .NET is practically abandoned in Gentoo and needs a complete reboot.
 # Removal in 30 days. Bug #681194, #722256, #740986, #740988, #740990.
-dev-dotnet/gio-sharp
 dev-dotnet/ikvm-bin
 dev-dotnet/log4net
 



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/mvapich2/, profiles/

2020-11-22 Thread David Seifert
commit: 7789551d42cdf355b81e1a2d8002a8e6cf9476bf
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 22 14:54:09 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 22 14:54:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7789551d

sys-cluster/mvapich2: Remove last-rited package

Closes: https://bugs.gentoo.org/463188
Closes: https://bugs.gentoo.org/531104
Closes: https://bugs.gentoo.org/613116
Closes: https://bugs.gentoo.org/740926
Signed-off-by: David Seifert  gentoo.org>

 profiles/package.mask|   5 --
 sys-cluster/mvapich2/Manifest|   1 -
 sys-cluster/mvapich2/metadata.xml|  13 ---
 sys-cluster/mvapich2/mvapich2-1.6.ebuild | 142 ---
 4 files changed, 161 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 644c2addf8f..e6079ae1e84 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -408,11 +408,6 @@ dev-perl/ZMQ-LibZMQ2
 # bug #654244, #740952, #726912, #723060
 dev-lang/j
 
-# David Seifert  (2020-10-24)
-# EAPI 4, doesn't build, outdated, ebuild has multiple QA issues.
-# Removal in 30 days. Bug #463188, #531104, #613116, #740926.
-sys-cluster/mvapich2
-
 # David Seifert  (2020-10-24)
 # EAPI 4, fetch restricted, download link disappeared, fails to build.
 # Removal in 30 days. Bug #365713, #405277, #405437, #414793, #415699,

diff --git a/sys-cluster/mvapich2/Manifest b/sys-cluster/mvapich2/Manifest
deleted file mode 100644
index 9c59e1fd9d1..000
--- a/sys-cluster/mvapich2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mvapich2-1.6.tgz 23239787 BLAKE2B 
4cdd286d7a13f70b50ced6ac6cb3df51065225a33141410b699246f2b99d0f4b57611cd95f39806387c71d0f07257560c6f210ed4bbb8ce5fa5d2b8b7071db2c
 SHA512 
4a4aac17742f347c4daed40a8360576ff4c644c549d4a3b364c7d2b1eada6aecc514b447b4613111e113d8f9be79b5101a999298cf89ff19ce63523a54702289

diff --git a/sys-cluster/mvapich2/metadata.xml 
b/sys-cluster/mvapich2/metadata.xml
deleted file mode 100644
index ba65afe1075..000
--- a/sys-cluster/mvapich2/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-  
-clus...@gentoo.org
-Gentoo Cluster Project
-  
-  
-Automatically generated description for 
large-cluster
-Automatically generated description for 
medium-cluster
-Automatically generated description for romio
-  
-

diff --git a/sys-cluster/mvapich2/mvapich2-1.6.ebuild 
b/sys-cluster/mvapich2/mvapich2-1.6.ebuild
deleted file mode 100644
index 6d9ecdeadbc..000
--- a/sys-cluster/mvapich2/mvapich2-1.6.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit flag-o-matic fortran-2 toolchain-funcs
-
-DESCRIPTION="MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB"
-HOMEPAGE="http://mvapich.cse.ohio-state.edu/;
-SRC_URI="http://mvapich.cse.ohio-state.edu/download/mvapich2/mvapich2-${PV/_/-}.tgz;
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug fortran large-cluster medium-cluster romio threads"
-
-RDEPEND="
-   sys-fabric/libibverbs
-   sys-fabric/libibumad
-   sys-fabric/libibmad
-   sys-fabric/librdmacm"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/mvapich2-${PV/_/-}"
-
-pkg_setup() {
-   fortran-2_pkg_setup
-
-   if [ -z "${MVAPICH_HCA_TYPE}" ]; then
-   elog "${PN} needs to know which HCA it should optimize for.  
This is"
-   elog "passed to the ebuild with the variable, 
\${MVAPICH_HCA_TYPE}."
-   elog "Please choose one of:  _MLX_PCI_EX_SDR_, 
_MLX_PCI_EX_DDR_,"
-   elog "_MLX_PCI_X, _PATH_HT_, or _IBM_EHCA_."
-   elog "See make.mvapich2.detect in ${S} for more information."
-   die "MVAPICH_HCA_TYPE undefined"
-   fi
-
-   case ${ARCH} in
-   amd64)
-   if grep Intel /proc/cpuinfo &>/dev/null; then
-   BUILD_ARCH=-D_EM64T_
-   else
-   BUILD_ARCH=-D_X86_64_
-   fi
-   ;;
-   x86)
-   BUILD_ARCH=-D_IA32_
-   ;;
-   ia64)
-   BUILD_ARCH=-D_IA64_
-   ;;
-   ppc64)
-   BUILD_ARCH=-D_PPC64_
-   ;;
-   *)
-   die "unsupported architecture: ${ARCH}"
-   ;;
-   esac
-}
-
-src_prepare() {
-   einfo "Disabling examples"
-   # Examples are always compiled with the default 'all' target.  This
-   # causes problems when we don't

[gentoo-commits] repo/gentoo:master commit in: games-arcade/sdlroids/files/, games-arcade/sdlroids/

2020-11-22 Thread David Seifert
commit: 39ff15626bbf6ce5bf0bf9af6baec95e6f67b8d4
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 22 14:37:43 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 22 14:37:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39ff1562

games-arcade/sdlroids: Port to EAPI 7

Closes: https://bugs.gentoo.org/708388
Closes: https://bugs.gentoo.org/730834
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../sdlroids/files/sdlroids-1.3.4-Makefile.patch   |  15 +++
 .../sdlroids/files/sdlroids-1.3.4-fno-common.patch | 140 +
 3.4-sound.patch => sdlroids-1.3.4-sound.patch} |   0
 games-arcade/sdlroids/sdlroids-1.3.4-r4.ebuild |  30 +++--
 4 files changed, 172 insertions(+), 13 deletions(-)

diff --git a/games-arcade/sdlroids/files/sdlroids-1.3.4-Makefile.patch 
b/games-arcade/sdlroids/files/sdlroids-1.3.4-Makefile.patch
new file mode 100644
index 000..9577d4cb658
--- /dev/null
+++ b/games-arcade/sdlroids/files/sdlroids-1.3.4-Makefile.patch
@@ -0,0 +1,15 @@
+--- a/Makefile.am
 b/Makefile.am
+@@ -23,9 +23,9 @@
+ GFXDIR="$(datadir)/sdlroids/bmp/"
+ 
+ install-data-local:
+-  @/bin/sh $(srcdir)/mkinstalldirs $(SOUNDSDIR) $(GFXDIR)
+-  $(INSTALL_DATA) $(srcdir)/sounds/*.wav $(SOUNDSDIR)
+-  $(INSTALL_DATA)  $(srcdir)/bmp/*.bmp $(GFXDIR)
++  @/bin/sh $(srcdir)/mkinstalldirs $(DESTDIR)$(SOUNDSDIR) 
$(DESTDIR)$(GFXDIR)
++  $(INSTALL_DATA) $(srcdir)/sounds/*.wav $(DESTDIR)$(SOUNDSDIR)
++  $(INSTALL_DATA) $(srcdir)/bmp/*.bmp $(DESTDIR)$(GFXDIR)
+ 
+ # Data directories
+ INCLUDES=-Wall-Wcast-align -DDATADIR=\"$(datadir)/sdlroids/\"

diff --git a/games-arcade/sdlroids/files/sdlroids-1.3.4-fno-common.patch 
b/games-arcade/sdlroids/files/sdlroids-1.3.4-fno-common.patch
new file mode 100644
index 000..6288adf913b
--- /dev/null
+++ b/games-arcade/sdlroids/files/sdlroids-1.3.4-fno-common.patch
@@ -0,0 +1,140 @@
+--- a/getargs.h
 b/getargs.h
+@@ -37,4 +37,4 @@
+ 
+ /* getargs() prototype */
+ void getargs(int, char *[]);
+-int flagargs[NUMARGS];
++extern int flagargs[NUMARGS];
+--- a/sdl.c
 b/sdl.c
+@@ -282,7 +282,7 @@
+ #define SGN(a)(((a)<0) ? -1 : 1)
+ 
+ /* Draw an horizontal line in the current color */
+-inline void draw_horzline(Sint16 x1, Sint16 x2, Sint32 y)
++void draw_horzline(Sint16 x1, Sint16 x2, Sint32 y)
+ {
+   int i;
+   if (x1 < x2) {
+@@ -296,7 +296,7 @@
+ }
+ 
+ /* Draw an vertical line in the current color */
+-inline void draw_vertline(Sint16 x, Sint16 y1, Sint32 y2)
++void draw_vertline(Sint16 x, Sint16 y1, Sint32 y2)
+ {
+   int i;
+   if (y1 < y2) {
+@@ -310,7 +310,7 @@
+ }
+ 
+ /* Draw a line between two coordinates */
+-inline void drawline(int x1,int y1,int x2,int y2)
++void drawline(int x1,int y1,int x2,int y2)
+ {
+   int d, x, y, ax, ay, sx, sy, dx, dy;
+   if((dx = x2 - x1) == 0) { /* vertical line */
+@@ -358,7 +358,7 @@
+   }
+ }
+ 
+-inline void MoveTo(int x,int y)
++void MoveTo(int x,int y)
+ {
+   current_x = convx(x);
+   current_y = convy(y);
+@@ -366,12 +366,12 @@
+ 
+ 
+ /* Scaling blit function by Greg Velichansky */
+-inline Uint32 ifloor(Uint32 i)
++Uint32 ifloor(Uint32 i)
+ {
+   return i & 0x;
+ }
+ 
+-inline Uint32 iceil(Uint32 i)
++Uint32 iceil(Uint32 i)
+ {
+   return (i & 0x) ? i : ifloor(i) + (1<<16);
+ }
+@@ -379,7 +379,7 @@
+ 
+ /* The most pedantic-a%& getpixel and putpixel ever, hopefully. */
+ /* There may still be endianness bugs! These will be fixed after adequte 
testing. XXX XXX XXX */
+-inline int SDL_GetPixel (SDL_Surface *f, Uint32 x, Uint32 y,
++int SDL_GetPixel (SDL_Surface *f, Uint32 x, Uint32 y,
+Uint8 *r, Uint8 *g, Uint8 *b)
+ {
+   /*const Uint32 mask[] = {0x0, 0xff, 0x, 0xff, 0x};*/
+@@ -515,7 +515,7 @@
+ SDL_UnlockSurface(screen);
+   }
+ }
+-inline void lock_graphics() {
++void lock_graphics() {
+   if ( SDL_MUSTLOCK(screen) ) {
+ if ( SDL_LockSurface(screen) < 0 ) {
+   return;
+@@ -523,13 +523,13 @@
+   }
+ }
+ 
+-inline void ResetRefreshCoords()
++void ResetRefreshCoords()
+ {
+   minx = miny = -1;
+   maxx = maxy = 0;
+ }
+ 
+-inline void RedrawObject() {
++void RedrawObject() {
+   if(minx >= 0) {
+ rects[rec_counter].x = minx;
+ rects[rec_counter].y = miny;
+@@ -540,7 +540,7 @@
+ }
+ 
+ static int is_poly=0;
+-inline void LineTo(int x,int y)
++void LineTo(int x,int y)
+ {
+   x = convx(x); y = convy(y);
+   drawline(current_x,current_y,x,y);
+@@ -549,7 +549,7 @@
+ }
+ 
+ 
+-inline void Polyline(POINT *pts,int n)
++void Polyline(POINT *pts,int n)
+ {
+   int f;
+   if(n<2) return;
+@@ -560,7 +560,7 @@
+ LineTo(pts->x, pts->y);
+ }
+ 
+-inline void Circle(Sint16 x, Sint16 y, Sint32 r)
++void Circle(Sint16 x, Sint16 y, Sint32 r)
+ {
+   x = convx(x);
+   y = convy(y);  
+@@ -569,7 +569,7 @@
+ }
+ 
+ /* doesn

[gentoo-commits] repo/gentoo:master commit in: games-util/xqf/files/

2020-11-22 Thread David Seifert
commit: 6ebb9c8d9e3d5bd63cebcf51b58ababdbcebc48d
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 22 14:15:23 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 22 14:15:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ebb9c8d

games-util/xqf: Call AM_PROG_AR

Closes: https://bugs.gentoo.org/756040
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 games-util/xqf/files/xqf-1.0.6.2-underlink.patch | 28 
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch 
b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
index a40961eb25f..0e3ba3ed22e 100644
--- a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
+++ b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
@@ -1,13 +1,13 @@
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -41,6 +41,7 @@
-   $(GEOIP_LIB) \
-   $(PACKAGE_LIBS) \
-   $(GDK_PIXBUF_LIBS) \
-+  -lX11 \
-   -lz -ldl
+--- a/configure.in
 b/configure.in
+@@ -23,6 +23,7 @@
+ AC_ISC_POSIX
+ AC_PROG_LN_S
+ AC_PROG_RANLIB
++AM_PROG_AR
  
- xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic 
-Wl,--version-script=$(top_srcdir)/src/xqf.map
+ dnl Checks for header files.
+ AC_HEADER_STDC
 --- a/po/POTFILES.in
 +++ b/po/POTFILES.in
 @@ -21,6 +21,7 @@
@@ -18,3 +18,13 @@
  #src/server.c
  #src/skin.c
  #src/skin_pcx.c
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -41,6 +41,7 @@
+   $(GEOIP_LIB) \
+   $(PACKAGE_LIBS) \
+   $(GDK_PIXBUF_LIBS) \
++  -lX11 \
+   -lz -ldl
+ 
+ xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic 
-Wl,--version-script=$(top_srcdir)/src/xqf.map



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mpfi/

2020-11-21 Thread David Seifert
commit: 5141be0b130e6706bee2869feaa8d7ee1c7cd3cf
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 21 21:21:08 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 21 21:21:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5141be0b

sci-libs/mpfi: bump to 1.5.4

Closes: https://bugs.gentoo.org/742560
Closes: https://github.com/gentoo/gentoo/pull/18327
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-libs/mpfi/Manifest  |  1 +
 sci-libs/mpfi/mpfi-1.5.4.ebuild | 33 +
 2 files changed, 34 insertions(+)

diff --git a/sci-libs/mpfi/Manifest b/sci-libs/mpfi/Manifest
index e8c03ff1f9a..6e2dfd16d37 100644
--- a/sci-libs/mpfi/Manifest
+++ b/sci-libs/mpfi/Manifest
@@ -1 +1,2 @@
 DIST mpfi-1.5.3.tar.bz2 447256 BLAKE2B 
67bb9af362ec96c015571cbdaba09befc2241e0113b6177dd76eec97b619bbf9c924ba4d16583df664cafdb1a78c8700712e30633e91e5ae6f1d5e084c3ede5c
 SHA512 
9c3cdf665fccff8b383c96827f4acb7aa62efdf7854cff271455273f00f8e7ecf84fbe191b02e5f51fe067aaae564fd2a0add062070ff5c1f542d61a021f967d
+DIST mpfi-1.5.4.tgz 261696 BLAKE2B 
264453870fbf18afc0876eef72a3fc9690e9eee1da5179831a24409159abe75b88dc373e2d20b8171c846e870ded876715b2c9034ab4f0d0f0ff10e34abd099d
 SHA512 
72ba7d8c950f4d4e2c7a3da8570cdcec08f75b73580cdf64c4cc3b24f8add23c46ccf78a6de2158e81bd77e6efabceebbae418988d536e7484356b8102e10ce1

diff --git a/sci-libs/mpfi/mpfi-1.5.4.ebuild b/sci-libs/mpfi/mpfi-1.5.4.ebuild
new file mode 100644
index 000..7c513767c67
--- /dev/null
+++ b/sci-libs/mpfi/mpfi-1.5.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Multiple precision interval arithmetic library based on MPFR"
+HOMEPAGE="http://perso.ens-lyon.fr/nathalie.revol/software.html;
+SRC_URI="https://gforge.inria.fr/frs/download.php/file/38111/${P}.tgz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+   dev-libs/gmp:0=
+   dev-libs/mpfr:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf --disable-static
+}
+
+src_install() {
+   default
+   find "${ED}" -name '*.la' -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/mopac7/files/

2020-11-21 Thread David Seifert
commit: c686715a25d808342ad192a74566ea58f0b73d3a
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 21 21:21:14 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 21 21:21:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c686715a

sci-chemistry/mopac7: update Makefile

Static libs support was dropped in
6462d72580431c13b96063e7a6935e4f89b281f4. Update the Makefile to reflect
changes. 'ar' is not being called anymore.

Closes: https://bugs.gentoo.org/724400
Closes: https://github.com/gentoo/gentoo/pull/18319
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-chemistry/mopac7/files/Makefile | 5 -
 1 file changed, 5 deletions(-)

diff --git a/sci-chemistry/mopac7/files/Makefile 
b/sci-chemistry/mopac7/files/Makefile
index 50370b3c278..bcada8b0a88 100644
--- a/sci-chemistry/mopac7/files/Makefile
+++ b/sci-chemistry/mopac7/files/Makefile
@@ -16,8 +16,3 @@ clean:
 libgmxmopac7: $(objects)
$(FC) -shared $(LDFLAGS) -Wl,-soname,libgmxmopac7.so.$(MAJOR) -o 
$@.so.$(VERSION) $^ $(LIBS)
ln -sf $@.so.$(VERSION) libgmxmopac7.so
-
-static: $(objects)
-   ar rcv libgmxmopac7.a *.o
-   ranlib libgmxmopac7.a
-



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/procheck/

2020-11-21 Thread David Seifert
commit: 1e12ed2024d17b9dfae07efdcc1b179445d31650
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 21 21:21:11 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 21 21:21:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e12ed20

sci-chemistry/procheck: update HOMEPAGE

Closes: https://bugs.gentoo.org/680404
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-chemistry/procheck/procheck-3.5.4-r3.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-chemistry/procheck/procheck-3.5.4-r3.ebuild 
b/sci-chemistry/procheck/procheck-3.5.4-r3.ebuild
index cc536d671b8..1a700ee4110 100644
--- a/sci-chemistry/procheck/procheck-3.5.4-r3.ebuild
+++ b/sci-chemistry/procheck/procheck-3.5.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit fortran-2 multilib toolchain-funcs versionator
 
 DESCRIPTION="Checks the stereochemical quality of a protein structure"
-HOMEPAGE="http://www.biochem.ucl.ac.uk/~roman/procheck/procheck.html;
+HOMEPAGE="https://www.ebi.ac.uk/thornton-srv/software/PROCHECK;
 SRC_URI="
${P}.tar.gz ${P}-README
doc? ( ${P}-manual.tar.gz )"
@@ -24,7 +24,7 @@ RESTRICT="fetch"
 S="${WORKDIR}/${PN}"
 
 pkg_nofetch() {
-   elog "Please visit 
http://www.ebi.ac.uk/thornton-srv/software/PROCHECK/download.html;
+   elog "Please visit 
https://www.ebi.ac.uk/thornton-srv/software/PROCHECK/download.html;
elog "and follow the instruction for downloading."
elog "Files should be renamed in the following way before being copied 
to your"
elog "DISTDIR directory:"



[gentoo-commits] repo/gentoo:master commit in: games-action/0verkill/, games-action/0verkill/files/

2020-11-21 Thread David Seifert
commit: 35ac0c893a3c15c90100033ed7962f63640b7fb7
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 21:01:48 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 21 21:01:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ac0c89

games-action/0verkill: Port to EAPI 7

Closes: https://bugs.gentoo.org/708718
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 games-action/0verkill/0verkill-0.16-r4.ebuild  | 17 +++--
 .../0verkill/files/0verkill-0.16-fno-common.patch  | 87 ++
 2 files changed, 96 insertions(+), 8 deletions(-)

diff --git a/games-action/0verkill/0verkill-0.16-r4.ebuild 
b/games-action/0verkill/0verkill-0.16-r4.ebuild
index e1b5419bf8c..39ebed3ca4c 100644
--- a/games-action/0verkill/0verkill-0.16-r4.ebuild
+++ b/games-action/0verkill/0verkill-0.16-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -18,13 +18,14 @@ DEPEND="X? ( x11-libs/libXpm )"
 RDEPEND=${DEPEND}
 
 PATCHES=(
-   "${FILESDIR}"/${P}-docs.patch
-   "${FILESDIR}"/${P}-home-overflow.patch
-   "${FILESDIR}"/${P}-segv.patch
-   "${FILESDIR}"/${P}-gentoo-paths.patch
-   "${FILESDIR}"/${P}-ovflfix.patch
-   "${FILESDIR}"/${P}-CC.patch
-   "${FILESDIR}"/${P}-underflow-check.patch #136222
+   "${FILESDIR}"/${P}-docs.patch
+   "${FILESDIR}"/${P}-home-overflow.patch
+   "${FILESDIR}"/${P}-segv.patch
+   "${FILESDIR}"/${P}-gentoo-paths.patch
+   "${FILESDIR}"/${P}-ovflfix.patch
+   "${FILESDIR}"/${P}-CC.patch
+   "${FILESDIR}"/${P}-underflow-check.patch #136222
+   "${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {

diff --git a/games-action/0verkill/files/0verkill-0.16-fno-common.patch 
b/games-action/0verkill/files/0verkill-0.16-fno-common.patch
new file mode 100644
index 000..bf03ff424e2
--- /dev/null
+++ b/games-action/0verkill/files/0verkill-0.16-fno-common.patch
@@ -0,0 +1,87 @@
+--- a/bot.c
 b/bot.c
+@@ -104,7 +104,7 @@
+ 
+ /* objects */
+ struct object_list objects;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ struct it* hero;
+ 
+ unsigned long_long game_start_offset; /* time difference between game start 
on this machine and on server */
+--- a/client.c
 b/client.c
+@@ -97,7 +97,7 @@
+ 
+ /* objects */
+ struct object_list objects;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ struct it* hero;
+ 
+ /* important sprites */
+--- a/data.c
 b/data.c
+@@ -13,6 +13,9 @@
+ #include "md5.h"
+ #include "error.h"
+ 
++unsigned char *weapon_name[ARMS];
++struct obj_attr_type obj_attr[N_TYPES];
++struct weapon_type weapon[ARMS];
+ 
+ #ifdef TRI_D
+ int tri_d=0;
+--- a/data.h
 b/data.h
+@@ -62,7 +62,7 @@
+ 
+ #define ARMS 5
+ 
+-unsigned char *weapon_name[ARMS];
++extern unsigned char *weapon_name[ARMS];
+ 
+ /* STATUS
+ 0: walk
+@@ -91,7 +91,8 @@
+ bit 1=server updates
+ bit 2=server sends updates to clients
+ */
+-}obj_attr[N_TYPES];
++};
++extern struct obj_attr_type obj_attr[N_TYPES];
+ 
+ 
+ /* weapon attribut table */
+@@ -107,7 +108,8 @@
+   unsigned char add_ammo;
+   unsigned char max_ammo;
+   my_double shell_xspeed,shell_yspeed;
+-}weapon[ARMS];
++};
++extern struct weapon_type weapon[ARMS];
+ 
+ 
+ /* object in the game */
+--- a/editor.c
 b/editor.c
+@@ -26,7 +26,7 @@
+ int oldx=0,oldy=0;  /* old cursor position */
+ 
+ struct object_list objects;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ int level_number;
+ 
+ 
+--- a/server.c
 b/server.c
+@@ -100,7 +100,7 @@
+ struct object_list objects;
+ 
+ struct player_list *last_player;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ 
+ 
+ #ifdef WIN32



[gentoo-commits] repo/gentoo:master commit in: games-emulation/advancemame/, games-emulation/advancemame/files/

2020-11-21 Thread David Seifert
commit: 5615d9ee802541a4d6d1e6ffe77dddc4550806ac
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:38:07 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:38:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5615d9ee

games-emulation/advancemame: Add upstream patch for -fno-common

Closes: https://bugs.gentoo.org/706924
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 games-emulation/advancemame/advancemame-3.9.ebuild |  1 +
 .../files/advancemame-3.9-fno-common.patch | 33 ++
 2 files changed, 34 insertions(+)

diff --git a/games-emulation/advancemame/advancemame-3.9.ebuild 
b/games-emulation/advancemame/advancemame-3.9.ebuild
index 61a5a35b78d..2759ceac28f 100644
--- a/games-emulation/advancemame/advancemame-3.9.ebuild
+++ b/games-emulation/advancemame/advancemame-3.9.ebuild
@@ -43,6 +43,7 @@ PATCHES=(
"${FILESDIR}"/${P}-blank-flags.patch
"${FILESDIR}"/${P}-DESTDIR.patch
"${FILESDIR}"/${P}-FHS.patch
+   "${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {

diff --git a/games-emulation/advancemame/files/advancemame-3.9-fno-common.patch 
b/games-emulation/advancemame/files/advancemame-3.9-fno-common.patch
new file mode 100644
index 000..c378b9aa919
--- /dev/null
+++ b/games-emulation/advancemame/files/advancemame-3.9-fno-common.patch
@@ -0,0 +1,33 @@
+From f8688cae05799a30cd5337e626a07fa9f004c0a3 Mon Sep 17 00:00:00 2001
+From: Andrea Mazzoleni 
+Date: Fri, 23 Oct 2020 21:29:41 +0200
+Subject: [PATCH] Fix build errors due new gcc 10 default for -fno-common
+
+---
+ src/drivers/cavepgm.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/drivers/cavepgm.c b/src/drivers/cavepgm.c
+index 38d3dae8..df6e97ab 100644
+--- a/src/drivers/cavepgm.c
 b/src/drivers/cavepgm.c
+@@ -287,7 +287,7 @@ IGS PCB NO-0136 (Riser)
+ #include "timer.h"
+ 
+ 
+-UINT16 *pgm_mainram, *pgm_bg_videoram, *pgm_tx_videoram, *pgm_videoregs, 
*pgm_rowscrollram;
++extern UINT16 *pgm_mainram, *pgm_bg_videoram, *pgm_tx_videoram, 
*pgm_videoregs, *pgm_rowscrollram;
+ static UINT8 *z80_mainram;
+ static UINT32 *arm7_shareram;
+ static UINT32 arm7_latch;
+@@ -852,8 +852,8 @@ static void expand_32x32x5bpp(void)
+ /* This function expands the sprite colour data (in the A Roms) from 3 pixels
+in each word to a byte per pixel making it easier to use */
+ 
+-UINT8 *pgm_sprite_a_region;
+-size_tpgm_sprite_a_region_allocate;
++extern UINT8 *pgm_sprite_a_region;
++extern size_t pgm_sprite_a_region_allocate;
+ 
+ static void expand_colourdata(void)
+ {



[gentoo-commits] repo/gentoo:master commit in: games-emulation/gens/, games-emulation/gens/files/

2020-11-21 Thread David Seifert
commit: 02744bab811337194c9f27182e6e912020034221
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:38:14 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:38:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02744bab

games-emulation/gens: Port to EAPI 7

Closes: https://bugs.gentoo.org/654420
Closes: https://bugs.gentoo.org/712982
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../gens/files/gens-2.15.5-fno-common.patch| 58 ++
 .../gens/files/gens-2.15.5-zlib-OF.patch   |  7 +++
 games-emulation/gens/gens-2.15.5-r1.ebuild | 48 --
 games-emulation/gens/gens-2.15.5-r2.ebuild | 50 +++
 4 files changed, 115 insertions(+), 48 deletions(-)

diff --git a/games-emulation/gens/files/gens-2.15.5-fno-common.patch 
b/games-emulation/gens/files/gens-2.15.5-fno-common.patch
new file mode 100644
index 000..b4493378e6f
--- /dev/null
+++ b/games-emulation/gens/files/gens-2.15.5-fno-common.patch
@@ -0,0 +1,58 @@
+--- a/src/gens/gens_core/sound/ym2612.c
 b/src/gens/gens_core/sound/ym2612.c
+@@ -241,7 +241,7 @@
+  ***/
+ 
+ 
+-INLINE void
++void
+ CALC_FINC_SL (slot_ * SL, int finc, int kc)
+ {
+   int ksr;
+@@ -284,7 +284,7 @@
+ }
+ 
+ 
+-INLINE void
++void
+ CALC_FINC_CH (channel_ * CH)
+ {
+   int finc, kc;
+@@ -305,7 +305,7 @@
+  ***/
+ 
+ 
+-INLINE void
++void
+ KEY_ON (channel_ * CH, int nsl)
+ {
+   slot_ *SL = &(CH->SLOT[nsl]);   // on recupère le bon pointeur de slot
+@@ -331,7 +331,7 @@
+ }
+ 
+ 
+-INLINE void
++void
+ KEY_OFF (channel_ * CH, int nsl)
+ {
+   slot_ *SL = &(CH->SLOT[nsl]);   // on recupère le bon pointeur de slot
+@@ -351,7 +351,7 @@
+ }
+ 
+ 
+-INLINE void
++void
+ CSM_Key_Control ()
+ {
+   KEY_ON ([2], 0);
+--- a/src/gens/segacd/cd_aspi.c
 b/src/gens/segacd/cd_aspi.c
+@@ -55,7 +55,7 @@
+ DWORD (*Get_ASPI_Version) (void);
+ DWORD (*Send_ASPI_Command) (LPSRB);
+ int ASPI_Command_Running;
+-int CDROM_SPEED;
++extern int CDROM_SPEED;
+ int Num_CD_Drive;
+ int CUR_DEV; // a che serve?
+ int DEV_PAR[8][3];

diff --git a/games-emulation/gens/files/gens-2.15.5-zlib-OF.patch 
b/games-emulation/gens/files/gens-2.15.5-zlib-OF.patch
new file mode 100644
index 000..5a357cc633e
--- /dev/null
+++ b/games-emulation/gens/files/gens-2.15.5-zlib-OF.patch
@@ -0,0 +1,7 @@
+--- a/src/gens/util/file/unzip.h
 b/src/gens/util/file/unzip.h
+@@ -1,3 +1,4 @@
++#define OF(x) x
+ /* unzip.h -- IO for uncompress .zip files using zlib 
+Version 0.15 beta, Mar 19th, 1998,
+ 

diff --git a/games-emulation/gens/gens-2.15.5-r1.ebuild 
b/games-emulation/gens/gens-2.15.5-r1.ebuild
deleted file mode 100644
index de49e5ffa08..000
--- a/games-emulation/gens/gens-2.15.5-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop flag-o-matic
-
-DESCRIPTION="A Sega Genesis/CD/32X emulator"
-HOMEPAGE="https://sourceforge.net/projects/gens/;
-SRC_URI="mirror://sourceforge/gens/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-   virtual/opengl
-   >=media-libs/libsdl-1.2[joystick,video]
-   x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
-   >=dev-lang/nasm-0.98
-"
-
-src_prepare() {
-   default
-   eapply \
-   "${FILESDIR}"/${P}-romsdir.patch \
-   "${FILESDIR}"/${P}-as-needed.patch \
-   "${FILESDIR}"/${P}-ovflfix.patch \
-   "${FILESDIR}"/${P}-gcc34.patch
-   sed -i -e '1i#define OF(x) x' src/gens/util/file/unzip.h || die
-   append-ldflags -Wl,-z,noexecstack
-}
-
-src_configure() {
-   use amd64 && multilib_toolchain_setup x86 #441876
-   econf \
-   --disable-gtktest \
-   --disable-sdltest
-}
-
-src_install() {
-   DOCS="AUTHORS BUGS README gens.txt history.txt" \
-   default
-   newicon pixmaps/gens_small.png ${PN}.png
-   make_desktop_entry "${PN}" "Gens"
-}

diff --git a/games-emulation/gens/gens-2.15.5-r2.ebuild 
b/games-emulation/gens/gens-2.15.5-r2.ebuild
new file mode 100644
index 000..7b8c385e9b0
--- /dev/null
+++ b/games-emulation/gens/gens-2.15.5-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_32 )
+
+inherit desktop flag-o-matic multilib-build
+
+DESCRIPTION="A Sega Genesis/CD/32X emulator"
+HOMEPAGE="https://sourceforge.net/projects/gens/;
+SRC_URI="mirror://sourcefor

[gentoo-commits] repo/gentoo:master commit in: games-rpg/daimonin-client/, games-rpg/daimonin-client/files/

2020-11-21 Thread David Seifert
commit: 7075cd03fb20c63fda4008b1cd7d50147a024663
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:38:17 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:38:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7075cd03

games-rpg/daimonin-client: Port to EAPI 7

Closes: https://bugs.gentoo.org/639304
Closes: https://bugs.gentoo.org/708788
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../daimonin-client/daimonin-client-0.10.8.ebuild  |  17 +--
 .../files/daimonin-client-0.10.8-fno-common.patch  | 128 +
 2 files changed, 138 insertions(+), 7 deletions(-)

diff --git a/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild 
b/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild
index 3ee1bd720d7..4cd5b762386 100644
--- a/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild
+++ b/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils
+inherit autotools desktop
 
 DESCRIPTION="A graphical 2D tile-based MMORPG"
 HOMEPAGE="http://daimonin.sourceforge.net/;
-SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.zip
+SRC_URI="
+   https://dev.gentoo.org/~soap/distfiles/${P}.zip
music? ( mirror://sourceforge/daimonin/daimoninMusicLQ20100827.zip )"
 
 LICENSE="GPL-2"
@@ -22,10 +23,10 @@ RDEPEND="
media-libs/sdl-mixer[vorbis]
net-misc/curl
sys-libs/zlib:="
-DEPEND="${RDEPEND}
-   app-arch/unzip"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/daimonin-code-8183-trunk/client/make/linux
+S="${WORKDIR}/daimonin-code-8183-trunk/client/make/linux"
 
 src_unpack() {
unpack ${P}.zip
@@ -42,6 +43,7 @@ src_prepare() {
 
pushd ../../src >/dev/null || die
eapply "${FILESDIR}"/${PN}-0.10.5-datadir.patch
+   eapply "${FILESDIR}"/${PN}-0.10.8-fno-common.patch
popd >/dev/null || die
 
eapply_user
@@ -64,6 +66,7 @@ src_install() {
 
cd ../.. || die
dodoc README*
+
newicon bitmaps/pentagram.png "daimonin.png"
make_desktop_entry "daimonin" "Daimonin" "daimonin" "Game;Amusement"
 }

diff --git 
a/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fno-common.patch 
b/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fno-common.patch
new file mode 100644
index 000..d4369e5f3fb
--- /dev/null
+++ b/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fno-common.patch
@@ -0,0 +1,128 @@
+--- a/dialog.c
 b/dialog.c
+@@ -581,7 +581,7 @@
+ /**
+  draws all options for the actual page.
+ **/
+-inline void optwin_draw_options(int x, int y)
++void optwin_draw_options(int x, int y)
+ {
+ #define LEN_NAME  111
+ int i = -1, pos = 0, max = 0;
+--- a/include/main.h
 b/include/main.h
+@@ -118,7 +118,7 @@
+ }
+ _bmaptype_table;
+ 
+-_bmaptype_table bmaptype_table[BMAPTABLE];
++extern _bmaptype_table bmaptype_table[BMAPTABLE];
+ 
+ extern int  bmaptype_table_size;
+ 
+@@ -306,7 +306,7 @@
+ double killhour;
+ } _statometer;
+ 
+-struct statometer statometer;
++extern struct statometer statometer;
+ 
+ extern time_t sleeptime;
+ 
+--- a/include/map.h
 b/include/map.h
+@@ -70,7 +70,7 @@
+ }
+ _mapdata;
+ 
+-struct MapCell
++typedef struct MapCell
+ {
+ short   faces[MAXFACES];
+ short   pos[MAXFACES];
+@@ -85,7 +85,7 @@
+ }
+ MapCell;
+ 
+-struct Map
++typedef struct Map
+ {
+ struct MapCell  cells[MAP_MAX_SIZE][MAP_MAX_SIZE];
+ }
+--- a/include/menu.h
 b/include/menu.h
+@@ -41,15 +41,15 @@
+ #define MENU_ALL (MENU_NO & MENU_KEYBIND & MENU_SPELL & MENU_STATUS & 
MENU_OPTION & MENU_NPC & MENU_BOOK & MENU_QUEST)
+ 
+ #define MENU_SOUND_VOL 40
+-struct _skill_list  skill_list[SKILL_LIST_MAX];
++extern struct _skill_list  skill_list[SKILL_LIST_MAX];
+ extern _dialog_list_set skill_list_set;
+ 
+-struct _spell_list  spell_list[SPELL_LIST_MAX]; /* skill list entries */
++extern struct _spell_list  spell_list[SPELL_LIST_MAX]; /* skill list 
entries */
+ extern _dialog_list_set spell_list_set;
+ 
+ extern _dialog_list_set option_list_set;
+ 
+-struct _bindkey_listbindkey_list[BINDKEY_LIST_MAX];
++extern struct _bindkey_listbindkey_list[BINDKEY_LIST_MAX];
+ extern _dialog_list_set bindkey_list_set;
+ 
+ extern _dialog_list_set create_list_set;
+--- a/include/wrapper.h
 b/include/wrapper.h
+@@ -118,7 +118,7 @@
+ extern int  parse_metaserver_

[gentoo-commits] repo/gentoo:master commit in: games-arcade/primateplunge/files/, games-arcade/primateplunge/

2020-11-21 Thread David Seifert
commit: 94d1d63f0c6234165b650f748b03af9f34238ac9
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:38:11 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:38:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94d1d63f

games-arcade/primateplunge: Port to EAPI 7

Closes: https://bugs.gentoo.org/724414
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../files/primateplunge-1.1-fno-common.patch | 11 +++
 .../primateplunge/primateplunge-1.1-r2.ebuild| 20 +---
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git 
a/games-arcade/primateplunge/files/primateplunge-1.1-fno-common.patch 
b/games-arcade/primateplunge/files/primateplunge-1.1-fno-common.patch
new file mode 100644
index 000..7905b0372e7
--- /dev/null
+++ b/games-arcade/primateplunge/files/primateplunge-1.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/game.h
 b/src/game.h
+@@ -125,7 +125,7 @@
+ 
+ 
+ /* Glabals in main.c */
+-SDL_Surface *mainScreen;
++extern SDL_Surface *mainScreen;
+ 
+ /* Globals in game.c */
+ extern world* currentWorld;

diff --git a/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild 
b/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild
index 4023588bfee..b14ba0d459b 100644
--- a/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild
+++ b/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools desktop
 
 DESCRIPTION="Help poor Monkey navigate his way down through treacherous areas"
@@ -11,22 +12,27 @@ SRC_URI="https://www.aelius.com/${PN}/${P}.tar.gz;
 LICENSE="Primate-Plunge"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="mirror bindist" #465850
 
-DEPEND="media-libs/libsdl[sound,video]
+DEPEND="
+   media-libs/libsdl[sound,video]
media-libs/sdl-mixer"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-AC_SUBST.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+)
+
 src_prepare() {
default
-   eapply "${FILESDIR}"/${P}-AC_SUBST.patch
eautoreconf
 }
 
 src_install() {
default
dodoc TIPS
-   newicon graphics/idle.bmp ${PN}.bmp
-   make_desktop_entry ${PN} "Primate Plunge" /usr/share/pixmaps/${PN}.bmp
+
+   newicon graphics/idle.bmp primateplunge.bmp
+   make_desktop_entry primateplunge "Primate Plunge" 
/usr/share/pixmaps/primateplunge.bmp
 }



[gentoo-commits] repo/gentoo:master commit in: games-util/xqf/files/, games-util/xqf/

2020-11-21 Thread David Seifert
commit: 279a598fceda81830fd5a42feb7f53581dbabeca
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:37:52 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:37:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=279a598f

games-util/xqf: Port to EAPI 7

Closes: https://bugs.gentoo.org/633562
Closes: https://bugs.gentoo.org/708754
Closes: https://bugs.gentoo.org/739402
Closes: https://bugs.gentoo.org/741774
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 games-util/xqf/files/xqf-1.0.6.2-fno-common.patch | 21 +++
 games-util/xqf/files/xqf-1.0.6.2-underlink.patch  | 14 --
 games-util/xqf/xqf-1.0.6.2.ebuild | 31 +--
 3 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/games-util/xqf/files/xqf-1.0.6.2-fno-common.patch 
b/games-util/xqf/files/xqf-1.0.6.2-fno-common.patch
new file mode 100644
index 000..15147ac6d91
--- /dev/null
+++ b/games-util/xqf/files/xqf-1.0.6.2-fno-common.patch
@@ -0,0 +1,21 @@
+--- a/src/filter.c
 b/src/filter.c
+@@ -88,6 +88,8 @@
+ const char* filter_quick_get(void);
+ void filter_quick_unset (void);
+ 
++unsigned int current_server_filter;
++
+ /* /QUICK FILTER */
+ 
+ struct filter filters[FILTERS_TOTAL] = {
+--- a/src/filter.h
 b/src/filter.h
+@@ -89,7 +89,6 @@
+ 
+ extern GArray* server_filters;
+ 
+-unsigned int current_server_filter;
+ extern unsigned int current_server_filter;
+ 
+ 

diff --git a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch 
b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
index fe93c762467..a40961eb25f 100644
--- a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
+++ b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
@@ -1,5 +1,5 @@
 xqf-xqf-1.0.6.2/src/Makefile.am
-+++ xqf-xqf-1.0.6.2/src/Makefile.am
+--- a/src/Makefile.am
 b/src/Makefile.am
 @@ -41,6 +41,7 @@
$(GEOIP_LIB) \
$(PACKAGE_LIBS) \
@@ -8,3 +8,13 @@
-lz -ldl
  
  xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic 
-Wl,--version-script=$(top_srcdir)/src/xqf.map
+--- a/po/POTFILES.in
 b/po/POTFILES.in
+@@ -21,6 +21,7 @@
+ #src/rc.c
+ src/rcon.c
+ src/redial.c
++src/scripts.c
+ #src/server.c
+ #src/skin.c
+ #src/skin_pcx.c

diff --git a/games-util/xqf/xqf-1.0.6.2.ebuild 
b/games-util/xqf/xqf-1.0.6.2.ebuild
index 5ea89476375..9c9510182f8 100644
--- a/games-util/xqf/xqf-1.0.6.2.ebuild
+++ b/games-util/xqf/xqf-1.0.6.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A server browser for many FPS games (frontend for qstat)"
 HOMEPAGE="http://xqf.github.io/en/;
@@ -13,26 +14,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="bzip2 geoip nls"
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+   x11-libs/gdk-pixbuf-xlib
+   x11-libs/gtk+:2
>=games-util/qstat-2.11
nls? ( virtual/libintl )
geoip? ( dev-libs/geoip )
bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )"
 
-S=${WORKDIR}/${PN}-${P}
+S="${WORKDIR}/${PN}-${P}"
 
-# bug #288853
-src_prepare() {
-   epatch \
-   "${FILESDIR}"/${P}-underlink.patch \
-   "${FILESDIR}"/${P}-zlib-1.2.5.1-compile-fix.patch
-   sed -i \
-   -e '/Icon/s/.png//' \
-   xqf.desktop.in || die
+PATCHES=(
+   "${FILESDIR}"/${P}-underlink.patch
+   "${FILESDIR}"/${P}-zlib-1.2.5.1-compile-fix.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+)
 
+src_prepare() {
+   default
mv configure.{in,ac} || die
eautoreconf
 }



[gentoo-commits] repo/gentoo:master commit in: games-util/fteqcc/, games-util/fteqcc/files/

2020-11-21 Thread David Seifert
commit: 493e624738974512a14a9eef9391f4c9340f659d
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:37:58 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:37:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493e6247

games-util/fteqcc: Port to EAPI 7

Closes: https://bugs.gentoo.org/707434
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 games-util/fteqcc/files/fteqcc-2501-Makefile.patch |  61 ++
 .../fteqcc/files/fteqcc-2501-cleanup-source.patch  | 205 +
 games-util/fteqcc/fteqcc-2501.ebuild   |  31 ++--
 3 files changed, 240 insertions(+), 57 deletions(-)

diff --git a/games-util/fteqcc/files/fteqcc-2501-Makefile.patch 
b/games-util/fteqcc/files/fteqcc-2501-Makefile.patch
new file mode 100644
index 000..cc70e9be4d8
--- /dev/null
+++ b/games-util/fteqcc/files/fteqcc-2501-Makefile.patch
@@ -0,0 +1,61 @@
+--- a/Makefile
 b/Makefile
+@@ -1,51 +1,19 @@
+ QCC_OBJS=qccmain.o qcc_cmdlib.o qcc_pr_comp.o qcc_pr_lex.o comprout.o hash.o 
qcd_main.o
+ GTKGUI_OBJS=qcc_gtk.o qccguistuff.c
+ 
+-CC=gcc -Wall -DQCCONLY
+-
+-DO_CC=$(CC) $(BASE_CFLAGS) -o $@ -c $< $(CFLAGS)
+-
+ all: qcc
+ 
+-BASE_CFLAGS=-ggdb
+-CFLAGS =
+-
++CFLAGS += -Wall
++CPPFLAGS += -DQCCONLY
+ 
+ win_nocyg: $(QCC_OBJS) qccgui.c qccguistuff.c
+-  $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 -s $(QCC_OBJS) -mno-cygwin 
-mwindows
++  $(CC) $(BASE_CFLAGS) -o fteqcc.exe $(QCC_OBJS) -mno-cygwin -mwindows
+ nocyg: $(QCC_OBJS) qccgui.c qccguistuff.c
+-  $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 -s $(QCC_OBJS) -mno-cygwin
++  $(CC) $(BASE_CFLAGS) -o fteqcc.exe $(QCC_OBJS) -mno-cygwin
+ win: $(QCC_OBJS) qccgui.c qccguistuff.c
+-  $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 -s $(QCC_OBJS) -mwindows
++  $(CC) $(BASE_CFLAGS) -o fteqcc.exe $(QCC_OBJS) -mwindows
+ qcc: $(QCC_OBJS)
+-  $(CC) $(BASE_CFLAGS) -o fteqcc.bin -O3 -s $(QCC_OBJS)
+-
+-qccmain.o: qccmain.c qcc.h
+-  $(DO_CC)
+-
+-qcc_cmdlib.o: qcc_cmdlib.c qcc.h
+-  $(DO_CC)
+-
+-qcc_pr_comp.o: qcc_pr_comp.c qcc.h
+-  $(DO_CC)
+-
+-qcc_pr_lex.o: qcc_pr_lex.c qcc.h
+-  $(DO_CC)
+-
+-comprout.o: comprout.c qcc.h
+-  $(DO_CC)
+-
+-hash.o: hash.c qcc.h
+-  $(DO_CC)
+-
+-qcd_main.o: qcd_main.c qcc.h
+-  $(DO_CC)
+-
+-qccguistuff.o: qccguistuff.c qcc.h
+-  $(DO_CC)
+-
+-qcc_gtk.o: qcc_gtk.c qcc.h
+-  $(DO_CC) `pkg-config --cflags gtk+-2.0`
++  $(CC) $(BASE_CFLAGS) $(LDFLAGS) -o fteqcc.bin $(QCC_OBJS)
+ 
+ gtkgui: $(QCC_OBJS) $(GTKGUI_OBJS)
+-  $(CC) $(BASE_CFLAGS) -DQCCONLY -DUSEGUI -o fteqccgui.bin -O3 
$(GTKGUI_OBJS) $(QCC_OBJS) `pkg-config --libs gtk+-2.0`
++  $(CC) $(CFLAGS) $(LDFLAGS) -DUSEGUI -o fteqccgui.bin $(GTKGUI_OBJS) 
$(QCC_OBJS) $(GTK_LIBS)

diff --git a/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch 
b/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch
index 35f3dcf100a..be8cccb074b 100644
--- a/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch
+++ b/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch
@@ -1,43 +1,5 @@
 qcc_pr_comp.c
-+++ qcc_pr_comp.c
-@@ -7322,7 +7322,7 @@
-   QCC_def_t   *def, *d;
-   QCC_function_t  *f;
-   QCC_dfunction_t *df;
--  int i;
-+  int i = 0;
-   pbool shared=false;
-   pbool externfnc=false;
-   pbool isconstant = false;
-@@ -8541,8 +8545,6 @@
-   struct qcc_includechunk_s *oldcurrentchunk;
-   extern struct qcc_includechunk_s *currentchunk;
- 
--  extern char qccmsourcedir[];
--
-   ocompilingfile = compilingfile;
-   os_file = s_file;
-   os_file2 = s_file2;
 hash.h
-+++ hash.h
-@@ -19,12 +19,12 @@
- int Hash_Key(char *name, int modulus);
- void *Hash_Get(hashtable_t *table, char *name);
- void *Hash_GetInsensative(hashtable_t *table, char *name);
--void *Hash_GetKey(hashtable_t *table, int key);
-+void *Hash_GetKey(hashtable_t *table, long key);
- void *Hash_GetNext(hashtable_t *table, char *name, void *old);
- void *Hash_GetNextInsensative(hashtable_t *table, char *name, void *old);
- void *Hash_Add(hashtable_t *table, char *name, void *data, bucket_t *buck);
- void *Hash_AddInsensative(hashtable_t *table, char *name, void *data, 
bucket_t *buck);
- void Hash_Remove(hashtable_t *table, char *name);
- void Hash_RemoveData(hashtable_t *table, char *name, void *data);
--void Hash_RemoveKey(hashtable_t *table, int key);
--void *Hash_AddKey(hashtable_t *table, int key, void *data, bucket_t *buck);
-+void Hash_RemoveKey(hashtable_t *table, long key);
-+void *Hash_AddKey(hashtable_t *table, long key, void *data, bucket_t *buck);
 hash.c
-+++ hash.c
+--- a/hash.c
 b/hash.c
 @@ -68,7 +68,7 @@
}
return NULL;
@@ -91,3 +53,166 @@
{
buck->next = buck->next->next;
return;
+--- a/hash.h
 b/hash.h
+@@ -

[gentoo-commits] repo/gentoo:master commit in: games-action/luola/, games-action/luola/files/

2020-11-21 Thread David Seifert
commit: 9212c96c491976f079b128f9c5e43bc285c564b9
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:37:55 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:37:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9212c96c

games-action/luola: Port to EAPI 7

Closes: https://bugs.gentoo.org/708664
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../luola/files/luola-1.3.2-fno-common.patch   | 33 ++
 games-action/luola/luola-1.3.2-r1.ebuild   | 32 -
 2 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/games-action/luola/files/luola-1.3.2-fno-common.patch 
b/games-action/luola/files/luola-1.3.2-fno-common.patch
new file mode 100644
index 000..e0b191df831
--- /dev/null
+++ b/games-action/luola/files/luola-1.3.2-fno-common.patch
@@ -0,0 +1,33 @@
+--- a/src/pilot.c
 b/src/pilot.c
+@@ -43,6 +43,8 @@
+ #define PILOT_STD_RADIUS 4.1 /* Normal radius for pilot */
+ #define PILOT_PAR_RADIUS 8.0 /* Parachuting radius for pilot */
+ 
++struct Pilot Pilot;
++
+ /* List of active pilots */
+ struct dllist *pilot_list;
+ 
+--- a/src/pilot.h
 b/src/pilot.h
+@@ -45,7 +45,8 @@
+ int toofast;/* How long has the pilot been falling too 
fast */
+ struct Spring *rope;/* The ninjarope */
+ int ropectrl;   /* -1 retracts rope, 1 extends it */
+-} Pilot;
++};
++extern struct Pilot Pilot;
+ 
+ /* Rope length limits. Actual rope length is nodelen*nodecount */
+ static const double pilot_rope_minlen = 0.1;
+--- a/tools/im_vwing.c
 b/tools/im_vwing.c
+@@ -24,6 +24,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #include "im_vwing.h"

diff --git a/games-action/luola/luola-1.3.2-r1.ebuild 
b/games-action/luola/luola-1.3.2-r1.ebuild
index ff2ec53aa18..0a2f70c623d 100644
--- a/games-action/luola/luola-1.3.2-r1.ebuild
+++ b/games-action/luola/luola-1.3.2-r1.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools desktop gnome2-utils
+inherit autotools desktop xdg
 
 DESCRIPTION="A 2D multiplayer arcade game resembling V-Wing"
 HOMEPAGE="http://freshmeat.sourceforge.net/projects/luola;
-SRC_URI="mirror://gentoo/${P}.tar.gz
+SRC_URI="
+   mirror://gentoo/${P}.tar.gz
mirror://gentoo/stdlevels-6.0.tar.gz
mirror://gentoo/nostalgia-1.2.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="media-libs/libsdl[X,sound,joystick,video]
+RDEPEND="
+   media-libs/libsdl[X,sound,joystick,video]
media-libs/sdl-gfx
media-libs/sdl-image[jpeg,png]
media-libs/sdl-mixer
@@ -25,6 +26,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
"${FILESDIR}"/${P}-underlink.patch
+   "${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {
@@ -37,24 +39,14 @@ src_configure() {
 }
 
 src_install() {
-   emake DESTDIR="${D}" install
+   default
+
insinto /usr/share/${PN}/levels
doins "${WORKDIR}"/*.{lev,png}
-   dodoc AUTHORS ChangeLog DATAFILE FAQ LEVELFILE README TODO \
-   RELEASENOTES.txt ../README.Nostalgia
+
+   dodoc DATAFILE LEVELFILE RELEASENOTES.txt ../README.Nostalgia
newdoc ../README README.stdlevels
+
doicon -s 64 luola.png
make_desktop_entry luola Luola
 }
-
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   gnome2_icon_cache_update
-}



[gentoo-commits] repo/gentoo:master commit in: games-arcade/spout/, games-arcade/spout/files/

2020-11-21 Thread David Seifert
commit: 8e425bad1f85cff1d86e657e630c9b1d687bc7ec
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:38:01 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:38:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e425bad

games-arcade/spout: Port to EAPI 7

Closes: https://bugs.gentoo.org/707266
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../spout/files/spout-1.3-fno-common.patch | 18 
 games-arcade/spout/spout-1.3-r1.ebuild | 34 --
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/games-arcade/spout/files/spout-1.3-fno-common.patch 
b/games-arcade/spout/files/spout-1.3-fno-common.patch
new file mode 100644
index 000..37c1098b082
--- /dev/null
+++ b/games-arcade/spout/files/spout-1.3-fno-common.patch
@@ -0,0 +1,18 @@
+--- a/piece.c
 b/piece.c
+@@ -11,6 +11,7 @@
+ 
+ SDL_Surface *video, *layer;
+ SDL_Rect layerRect;
++int zoom, fullscreen;
+ 
+ unsigned char *vBuffer = NULL;
+ 
+--- a/piece.h
 b/piece.h
+@@ -53,4 +53,4 @@
+ 
+ int pcePadGet ();
+ 
+-int zoom, fullscreen;
++extern int zoom, fullscreen;

diff --git a/games-arcade/spout/spout-1.3-r1.ebuild 
b/games-arcade/spout/spout-1.3-r1.ebuild
index 876b18d5568..2057b0f1b3b 100644
--- a/games-arcade/spout/spout-1.3-r1.ebuild
+++ b/games-arcade/spout/spout-1.3-r1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit desktop readme.gentoo-r1
 
 MY_P="spout-unix-${PV}"
+
 DESCRIPTION="Abstract Japanese caveflier / shooter"
 HOMEPAGE="http://freshmeat.net/projects/spout/;
 SRC_URI="http://rohanpm.net/files/old/${MY_P}.tar.bz2;
@@ -12,31 +14,31 @@ SRC_URI="http://rohanpm.net/files/old/${MY_P}.tar.bz2;
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2.6"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-To play in fullscreen mode, do 'spout f'.
-To play in a greater resolution, do 'spout x', where
-x is an integer; the larger x is, the higher the resolution.
-
-To play:
-* Accelerate - spacebar, enter, z, x
-* Pause - escape
-* Exit - shift+escape
-* Rotate - left or right
-"
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_install() {
dobin spout
+   einstalldocs
+
doicon spout.png
make_desktop_entry spout "Spout"
-   einstalldocs
+
+   local DOC_CONTENTS="
+   To play in fullscreen mode, do 'spout f'.
+   To play in a greater resolution, do 'spout x', where
+   x is an integer; the larger x is, the higher the resolution.
+
+   To play:
+   * Accelerate - spacebar, enter, z, x
+   * Pause - escape
+   * Exit - shift+escape
+   * Rotate - left or right"
readme.gentoo_create_doc
 }
 



[gentoo-commits] repo/gentoo:master commit in: dev-games/t4k-common/files/, dev-games/t4k-common/

2020-11-21 Thread David Seifert
commit: 74010217b98ba7f20211a93b53a34334893fa360
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:38:04 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:38:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74010217

dev-games/t4k-common: Port to EAPI 7

Closes: https://bugs.gentoo.org/707168
Closes: https://bugs.gentoo.org/715574
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../files/t4k-common-0.1.1-ICONV_CONST.patch   | 10 +++
 .../files/t4k-common-0.1.1-fno-common.patch| 11 
 .../t4k-common/files/t4k-common-0.1.1-libpng.patch |  4 +--
 dev-games/t4k-common/t4k-common-0.1.1.ebuild   | 33 +++---
 4 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/dev-games/t4k-common/files/t4k-common-0.1.1-ICONV_CONST.patch 
b/dev-games/t4k-common/files/t4k-common-0.1.1-ICONV_CONST.patch
new file mode 100644
index 000..037d2acd292
--- /dev/null
+++ b/dev-games/t4k-common/files/t4k-common-0.1.1-ICONV_CONST.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
 b/configure.ac
+@@ -39,6 +39,7 @@
+ AC_PROG_MKDIR_P
+ AC_PROG_YACC
+ AC_PROG_LIBTOOL
++AM_ICONV
+ 
+ 
+ # ---

diff --git a/dev-games/t4k-common/files/t4k-common-0.1.1-fno-common.patch 
b/dev-games/t4k-common/files/t4k-common-0.1.1-fno-common.patch
new file mode 100644
index 000..2bdf418649c
--- /dev/null
+++ b/dev-games/t4k-common/files/t4k-common-0.1.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/t4k_common.h
 b/src/t4k_common.h
+@@ -239,7 +239,7 @@
+ #define MAX_LINES 128 //!< Maximum lines to wrap.
+ #define MAX_LINEWIDTH 256 //!< Maximum characters of each line.
+ 
+-char wrapped_lines[MAX_LINES][MAX_LINEWIDTH]; //!< Global buffer for wrapped 
lines.
++extern char wrapped_lines[MAX_LINES][MAX_LINEWIDTH]; //!< Global buffer for 
wrapped lines.
+ 
+ //TODO separate headers for different areas a la SDL?
+ 

diff --git a/dev-games/t4k-common/files/t4k-common-0.1.1-libpng.patch 
b/dev-games/t4k-common/files/t4k-common-0.1.1-libpng.patch
index 29991544ddb..fad91de2d20 100644
--- a/dev-games/t4k-common/files/t4k-common-0.1.1-libpng.patch
+++ b/dev-games/t4k-common/files/t4k-common-0.1.1-libpng.patch
@@ -1,5 +1,5 @@
 src/t4k_common-0.1.1/src/t4k_loaders.c 2011-04-08 05:46:07.0 
+0300
-+++ src.new/t4k_common-0.1.1/src/t4k_loaders.c 2012-05-02 10:35:41.836670434 
+0300
+--- a/src/t4k_loaders.c
 b/src/t4k_loaders.c
 @@ -1028,12 +1028,9 @@
{
  png_init_io(png_ptr, fi);

diff --git a/dev-games/t4k-common/t4k-common-0.1.1.ebuild 
b/dev-games/t4k-common/t4k-common-0.1.1.ebuild
index 3c30d4d..e0a6d5009ab 100644
--- a/dev-games/t4k-common/t4k-common-0.1.1.ebuild
+++ b/dev-games/t4k-common/t4k-common-0.1.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils ltprune
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A library of code shared between tuxmath and tuxtype"
 HOMEPAGE="https://github.com/tux4kids/t4kcommon;
@@ -11,9 +12,10 @@ 
SRC_URI="https://github.com/tux4kids/t4kcommon/archive/upstream/${PV}.tar.gz ->
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="static-libs svg"
+IUSE="svg"
 
-RDEPEND="dev-libs/libxml2:2
+RDEPEND="
+   dev-libs/libxml2:2
media-libs/libsdl
media-libs/sdl-image
media-libs/sdl-mixer
@@ -25,22 +27,33 @@ RDEPEND="dev-libs/libxml2:2
media-libs/libpng:0
x11-libs/cairo
)"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+# need sys-devel/gettext for AM_ICONV in iconv.m4
+BDEPEND="
+   sys-devel/gettext
virtual/pkgconfig"
 
-S=${WORKDIR}/t4kcommon-upstream-${PV}
+S="${WORKDIR}/t4kcommon-upstream-${PV}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-libpng.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+   "${FILESDIR}"/${P}-ICONV_CONST.patch
+)
 
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-libpng.patch
+   default
+   rm m4/iconv.m4 || die
+   eautoreconf
 }
 
 src_configure() {
econf \
-   $(usex svg "" "--without-rsvg") \
-   $(use_enable static-libs static)
+   --disable-static \
+   $(usex svg "" --without-rsvg)
 }
 
 src_install() {
default
-   use static-libs || prune_libtool_files --all
+   find "${ED}" -name '*.la' -delete || die
 }



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cgal/

2020-11-20 Thread David Seifert
commit: 9dca40da96be57f7fb10f9a8a811b397de5b3fa6
Author: Aisha Tammy  aisha  cc>
AuthorDate: Fri Nov 20 09:53:02 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Fri Nov 20 09:53:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dca40da

sci-mathematics/cgal: new maintainer

Closes: https://github.com/gentoo/gentoo/pull/17926
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy  aisha.cc>
Signed-off-by: David Seifert  gentoo.org>

 sci-mathematics/cgal/metadata.xml | 8 
 1 file changed, 8 insertions(+)

diff --git a/sci-mathematics/cgal/metadata.xml 
b/sci-mathematics/cgal/metadata.xml
index ec85a1dbc69..d26f70426b3 100644
--- a/sci-mathematics/cgal/metadata.xml
+++ b/sci-mathematics/cgal/metadata.xml
@@ -5,6 +5,14 @@
 sci-mathemat...@gentoo.org
 Gentoo Mathematics Project
   
+  
+gen...@aisha.cc
+Aisha Tammy
+  
+  
+proxy-ma...@gentoo.org
+Proxy Maintainers
+  
   
   The Computational Geometry Algorithms Library is a collaborative
   open source library containing:



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cgal/

2020-11-20 Thread David Seifert
commit: 66483bfa09b4bb6e68d54eea4917bd474d590195
Author: Aisha Tammy  aisha  cc>
AuthorDate: Fri Nov 20 09:52:59 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Fri Nov 20 09:52:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66483bfa

sci-mathematics/cgal: version bump to 5.1

* also build shared libraries

Closes: https://bugs.gentoo.org/734662
Closes: https://bugs.gentoo.org/663232
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy  aisha.cc>
Signed-off-by: David Seifert  gentoo.org>

 sci-mathematics/cgal/Manifest|  2 +
 sci-mathematics/cgal/cgal-5.1.ebuild | 79 
 2 files changed, 81 insertions(+)

diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index 249dc57f583..a8c424b9974 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -1,2 +1,4 @@
 DIST CGAL-4.11.3-doc_html.tar.xz 30576756 BLAKE2B 
6d32f3bca1c5aee4ed09eb96a35113a8a71bf14679e204683268ccee56f4a4799ef696bebd5ec0fd6add964e23273efc87167c122a5dc781c9cc7b2f5b938c29
 SHA512 
a729bea11a9b853a8197cc7ebb089005f98868e393e91142946d45a485e2e9ac9eacce1b230d91240080033b5c31bfd0195820ee5ae7f621bdd75f1abf19244f
 DIST CGAL-4.11.3.tar.xz 14657412 BLAKE2B 
a10457d255fcdd822f90419ff6af5389c50e88b254ed7f37471e24bb8523732b5aa6bd1ee5e67f14fcf0d8e79abf86e798ddeb3e0ce965dc2cde5667377bf5e0
 SHA512 
44cdd5fb313841d208ffeb9a96aa8db5111defd581b749c80f655390b5468f7c18b61df0ac2bdeb5259507341cc451fcd8cd50f7ff0571efdcb76eb920f92f7e
+DIST CGAL-5.1-doc_html.tar.xz 50630976 BLAKE2B 
559287263b189ec5ac4a0b3445e1cc5862471285f28caca40f48b25b64eaef3426c42a178e4cb4db69a1e324963a9af665e84ca8f44da8b55ebb344f18f56fdc
 SHA512 
ada944d73d3e6465a14d87ee87d1cabaee2c4848622b5360c14d6a9b5ff5ba3e19859943ecb7595b0dec7e950f214aa47b6ab389c23dd5f2794fc21a9e3a17db
+DIST CGAL-5.1.tar.xz 22850692 BLAKE2B 
42320e07e222c3f69febe7dc478c74ef6cde0de723ea2d84c891b6e598d02c38026e9246edd467cadea8d66e527000a9b4af296ab026dd42c7876acea9824ccb
 SHA512 
41085eeb113cec0eede2e21df05c9d2530db5988b4f9d0379f8de7c655cab09266620eebe017e0141c0ccdbcbafe8c074fd5bec46a40aaba95aa7521732e4423

diff --git a/sci-mathematics/cgal/cgal-5.1.ebuild 
b/sci-mathematics/cgal/cgal-5.1.ebuild
new file mode 100644
index 000..4dde3874c44
--- /dev/null
+++ b/sci-mathematics/cgal/cgal-5.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P=CGAL-${PV}
+
+DESCRIPTION="C++ library for geometric algorithms and data structures"
+HOMEPAGE="https://www.cgal.org/;
+SRC_URI="
+   https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}.tar.xz
+   doc? ( 
https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}-doc_html.tar.xz )"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3 GPL-3 Boost-1.0"
+SLOT="0/14"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples +gmp mpfi ntl qt5"
+
+RDEPEND="
+   dev-cpp/eigen
+   dev-libs/boost:=[threads]
+   dev-libs/mpfr:=
+   sys-libs/zlib
+   x11-libs/libX11:=
+   virtual/glu:=
+   virtual/opengl:=
+   gmp? ( dev-libs/gmp:=[cxx] )
+   mpfi? ( sci-libs/mpfi )
+   ntl? ( dev-libs/ntl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtopengl:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   app-arch/xz-utils
+   virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.11.1-fix-buildsystem.patch )
+
+src_prepare() {
+   cmake_src_prepare
+   # modules provided by dev-cpp/eigen
+   rm cmake/modules/FindEigen3.cmake || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCGAL_INSTALL_LIB_DIR="$(get_libdir)"
+   -DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/CGAL"
+   -DCGAL_HEADER_ONLY=OFF
+   -DWITH_LEDA=OFF
+   -DWITH_Eigen3=ON
+   -DWITH_ZLIB=ON
+   -DWITH_GMP=$(usex gmp)
+   -DWITH_GMPXX=$(usex gmp)
+   -DWITH_MPFI=$(usex mpfi)
+   -DWITH_NTL=$(usex ntl)
+   -DWITH_CGAL_Qt5=$(usex qt5)
+   )
+   cmake_src_configure
+}
+
+src_install() {
+   use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. )
+   cmake_src_install
+   if use examples; then
+   dodoc -r examples demo
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: dev-cpp/catch/

2020-11-19 Thread David Seifert
commit: f0b28e539115d85d6fdc3a9b8ee6dce17dfed9b9
Author: David Seifert  gentoo  org>
AuthorDate: Thu Nov 19 11:35:03 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Thu Nov 19 11:35:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b28e53

dev-cpp/catch: Remove old 2.7.0 and 2.9.1

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 dev-cpp/catch/Manifest   |  2 --
 dev-cpp/catch/catch-2.7.0.ebuild | 44 
 dev-cpp/catch/catch-2.9.1.ebuild | 44 
 3 files changed, 90 deletions(-)

diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index b422d0c1845..55fca7ae5df 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,5 +1,3 @@
 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B 
bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f
 SHA512 
ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
 DIST Catch2-2.13.3.tar.gz 655431 BLAKE2B 
4343dab41818a4c85b875752b8d86a0dd1a46ce8c94d6773cee210a133f164b669053973c6678228b3afb356e25a3e705c8220b138c247a230e624b3f2412784
 SHA512 
caf0e3a39a2b5983346c2709ce06113da62881780117021c64db987d6c5190c41a9070fb70caa0ee6957cfef0baad87fff4e6558c9fea4fa464e82882fe17d55
 DIST Catch2-2.5.0.tar.gz 549328 BLAKE2B 
a32941a043a654228cc541dc675ad789f5b938ebc2d3177d1657f66f68fb175bec8c88a60ecba00e84eca74a7506dc83aed74ac89f7dde83213284eb4a497225
 SHA512 
420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8
-DIST Catch2-2.7.0.tar.gz 569753 BLAKE2B 
cec11d79c85ac8a5577467ceb4722a2441a1dbd2fbe42fb06324113d2a6f9fadc12de351735900817274520bf8533ec245ba0a3686c8c1b4813cf3136d6d552f
 SHA512 
ab6c816642a92418c76c8ddabf17eb0c19bef1dc6ac2405c820280d670ef1d78c9ae89909f5a36bf063f0939d253b7c6b5e845c1ac4e63b338927e125dee950d
-DIST Catch2-2.9.1.tar.gz 626539 BLAKE2B 
b68f17dba65cc8d1a842b105e5aa6a32e713df8d34c32b918e0588e6b87b8e3ae56f9130d1590795489afe2e29035c262a05795d0ee44c9e9ace2e814801821d
 SHA512 
ea18eef1fece72518c8a46b89727f5d0545a15038957087324abe6421c682693379476ff46106132f080677ebcc1c9ead51a9cf25dced3bb576a33e4f6fae4f6

diff --git a/dev-cpp/catch/catch-2.7.0.ebuild b/dev-cpp/catch/catch-2.7.0.ebuild
deleted file mode 100644
index 2467542c7d9..000
--- a/dev-cpp/catch/catch-2.7.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-utils python-any-r1
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/catchorg/Catch2.git;
-else
-   MY_P=${PN^}2-${PV}
-   SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> 
${MY_P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-
-   S=${WORKDIR}/${MY_P}
-fi
-
-DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/catchorg/Catch2;
-
-LICENSE="Boost-1.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-   use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCATCH_ENABLE_WERROR=OFF
-   -DBUILD_TESTING=$(usex test)
-   )
-   use test &&
-   mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
-
-   cmake-utils_src_configure
-}

diff --git a/dev-cpp/catch/catch-2.9.1.ebuild b/dev-cpp/catch/catch-2.9.1.ebuild
deleted file mode 100644
index 77dac8be453..000
--- a/dev-cpp/catch/catch-2.9.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-utils python-any-r1
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/catchorg/Catch2.git;
-else
-   MY_P=${PN^}2-${PV}
-   SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> 
${MY_P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-   S=${WORKDIR}/${MY_P}
-fi
-
-DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/catchorg/Catch2;
-
-LICENSE="Boost-1.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-   use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCATCH_ENABLE_WERROR=OFF
-   -DBUILD_TESTING=$(usex test)
-   )
-   use test &&
-   mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
-
-   cmake-utils_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: dev-cpp/catch/

2020-11-19 Thread David Seifert
commit: 7e0c0827b845e6a7bc94b07580994ac76b5d3c02
Author: David Seifert  gentoo  org>
AuthorDate: Thu Nov 19 11:34:57 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Thu Nov 19 11:34:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e0c0827

dev-cpp/catch: Version bump to 2.13.3

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 dev-cpp/catch/Manifest|  1 +
 dev-cpp/catch/catch-2.13.3.ebuild | 44 +++
 2 files changed, 45 insertions(+)

diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 078ea1be0db..b422d0c1845 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,4 +1,5 @@
 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B 
bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f
 SHA512 
ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
+DIST Catch2-2.13.3.tar.gz 655431 BLAKE2B 
4343dab41818a4c85b875752b8d86a0dd1a46ce8c94d6773cee210a133f164b669053973c6678228b3afb356e25a3e705c8220b138c247a230e624b3f2412784
 SHA512 
caf0e3a39a2b5983346c2709ce06113da62881780117021c64db987d6c5190c41a9070fb70caa0ee6957cfef0baad87fff4e6558c9fea4fa464e82882fe17d55
 DIST Catch2-2.5.0.tar.gz 549328 BLAKE2B 
a32941a043a654228cc541dc675ad789f5b938ebc2d3177d1657f66f68fb175bec8c88a60ecba00e84eca74a7506dc83aed74ac89f7dde83213284eb4a497225
 SHA512 
420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8
 DIST Catch2-2.7.0.tar.gz 569753 BLAKE2B 
cec11d79c85ac8a5577467ceb4722a2441a1dbd2fbe42fb06324113d2a6f9fadc12de351735900817274520bf8533ec245ba0a3686c8c1b4813cf3136d6d552f
 SHA512 
ab6c816642a92418c76c8ddabf17eb0c19bef1dc6ac2405c820280d670ef1d78c9ae89909f5a36bf063f0939d253b7c6b5e845c1ac4e63b338927e125dee950d
 DIST Catch2-2.9.1.tar.gz 626539 BLAKE2B 
b68f17dba65cc8d1a842b105e5aa6a32e713df8d34c32b918e0588e6b87b8e3ae56f9130d1590795489afe2e29035c262a05795d0ee44c9e9ace2e814801821d
 SHA512 
ea18eef1fece72518c8a46b89727f5d0545a15038957087324abe6421c682693379476ff46106132f080677ebcc1c9ead51a9cf25dced3bb576a33e4f6fae4f6

diff --git a/dev-cpp/catch/catch-2.13.3.ebuild 
b/dev-cpp/catch/catch-2.13.3.ebuild
new file mode 100644
index 000..87bf6c59f3c
--- /dev/null
+++ b/dev-cpp/catch/catch-2.13.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit cmake python-any-r1
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/catchorg/Catch2.git;
+else
+   MY_P=${PN^}2-${PV}
+   SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> 
${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+   S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Modern C++ header-only framework for unit-tests"
+HOMEPAGE="https://github.com/catchorg/Catch2;
+
+LICENSE="Boost-1.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+   use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCATCH_ENABLE_WERROR=OFF
+   -DBUILD_TESTING=$(usex test)
+   )
+   use test &&
+   mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
+
+   cmake_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: dev-cpp/catch/

2020-11-19 Thread David Seifert
commit: 7086420c2788668e1e6e82cfc33aa7d52185b5cd
Author: David Seifert  gentoo  org>
AuthorDate: Thu Nov 19 11:35:00 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Thu Nov 19 11:35:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7086420c

dev-cpp/catch: Sync live ebuild

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 dev-cpp/catch/catch-.ebuild | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev-cpp/catch/catch-.ebuild b/dev-cpp/catch/catch-.ebuild
index 07de51f3252..338bc2c2b37 100644
--- a/dev-cpp/catch/catch-.ebuild
+++ b/dev-cpp/catch/catch-.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 if [[ ${PV} == * ]]; then
inherit git-r3
@@ -13,9 +13,9 @@ if [[ ${PV} == * ]]; then
 else
MY_P=${PN^}2-${PV}
SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> 
${MY_P}.tar.gz"
-   KEYWORDS="~amd64 ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-   S=${WORKDIR}/${MY_P}
+   S="${WORKDIR}/${MY_P}"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
@@ -36,9 +36,10 @@ src_configure() {
local mycmakeargs=(
-DCATCH_ENABLE_WERROR=OFF
-DBUILD_TESTING=$(usex test)
+   -DCATCH_DEVELOPMENT_BUILD=$(usex test)
)
use test &&
mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }



[gentoo-commits] repo/gentoo:master commit in: dev-python/ubelt/

2020-11-18 Thread David Seifert
commit: c8eb6465a3eeab05296a481a2cb18c61bc57ed68
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Nov 18 18:57:43 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 18 18:57:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8eb6465

dev-python/ubelt: bump to 0.9.1, add python3_9

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-python/ubelt/Manifest   |  1 +
 dev-python/ubelt/ubelt-0.9.1.ebuild | 27 +++
 2 files changed, 28 insertions(+)

diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index f7a01d30994..1235f9899f2 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1 +1,2 @@
 DIST ubelt-0.8.8.tar.gz 172347 BLAKE2B 
94435bf8b5a5f67011540c43dd767393cda6bccf95b963ca74cf3ee72444de43828b87bd2e6aa93001fc2c7cd49e245c459b0bc8f2617f12da906ae4e3f194aa
 SHA512 
f63b3a9de51176d00a12999d540080e381266bb43b15942580f7f60b230b2e52021937b0cb4b31e084e0b77c141ae5cb3b8ae000d7af196e0c2f293a960e7438
+DIST ubelt-0.9.1.tar.gz 174866 BLAKE2B 
d9825cc266945e76560be0afaeaf28ce2c7ca99a9313f519c9e83fc987599a4d8c2d262af4f13040f522b91e3c73170f8af7fc7dbe9e40128b707d9a571f4b1a
 SHA512 
92edac331602ef292842d48cd03c3ae12aaaec7e5860fd47c83dbe0449dee584e95ce5dd157a0b84b557dc4f4b6a0ee66ccabb669c5923e9b9083daaa2eb92df

diff --git a/dev-python/ubelt/ubelt-0.9.1.ebuild 
b/dev-python/ubelt/ubelt-0.9.1.ebuild
new file mode 100644
index 000..0801d0bd427
--- /dev/null
+++ b/dev-python/ubelt/ubelt-0.9.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, 
Timing, Progress"
+HOMEPAGE="https://github.com/Erotemic/ubelt;
+SRC_URI="https://github.com/Erotemic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+   dev-python/ordered-set[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+   pytest -vv tests || die "Tests fail with ${EPYTHON}"
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/line_profiler/files/, dev-python/line_profiler/

2020-11-18 Thread David Seifert
commit: 87bc53fbc14cc579a8a58a4a65c72e7a99870fd4
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Nov 18 18:57:49 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 18 18:57:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87bc53fb

dev-python/line_profiler: add python3_9

Closes: https://github.com/gentoo/gentoo/pull/18312
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 .../files/line_profiler-3.0.2-python3_9.patch  | 35 ++
 .../line_profiler/line_profiler-3.0.2.ebuild   |  6 +++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/dev-python/line_profiler/files/line_profiler-3.0.2-python3_9.patch 
b/dev-python/line_profiler/files/line_profiler-3.0.2-python3_9.patch
new file mode 100644
index 000..74b0677bc70
--- /dev/null
+++ b/dev-python/line_profiler/files/line_profiler-3.0.2-python3_9.patch
@@ -0,0 +1,35 @@
+From f40a6e102d3c4808155af601ddba7733e597e604 Mon Sep 17 00:00:00 2001
+From: Stefano Rivera 
+Date: Thu, 15 Oct 2020 22:44:50 -0700
+Subject: [PATCH] Python 3.9 dropped gettimeofday configure checks
+
+Upstream status: Accepted [https://github.com/pyutils/line_profiler/pull/31}
+Signed-off-by: Jakov Smolic 
+
+diff --git a/line_profiler/timers.c b/line_profiler/timers.c
+index ae01060..e8ee6c6 100644
+--- a/line_profiler/timers.c
 b/line_profiler/timers.c
+@@ -32,10 +32,6 @@ hpTimerUnit(void)
+ 
+ #else  /* !MS_WINDOWS */
+ 
+-#ifndef HAVE_GETTIMEOFDAY
+-#error "This module requires gettimeofday() on non-Windows platforms!"
+-#endif
+-
+ #if (defined(PYOS_OS2) && defined(PYCC_GCC))
+ #include 
+ #else
+@@ -48,11 +44,7 @@ hpTimer(void)
+ {
+ struct timeval tv;
+ PY_LONG_LONG ret;
+-#ifdef GETTIMEOFDAY_NO_TZ
+-gettimeofday();
+-#else
+ gettimeofday(, (struct timezone *)NULL);
+-#endif
+ ret = tv.tv_sec;
+ ret = ret * 100 + tv.tv_usec;
+ return ret;

diff --git a/dev-python/line_profiler/line_profiler-3.0.2.ebuild 
b/dev-python/line_profiler/line_profiler-3.0.2.ebuild
index a48003e8777..5c557811592 100644
--- a/dev-python/line_profiler/line_profiler-3.0.2.ebuild
+++ b/dev-python/line_profiler/line_profiler-3.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -26,6 +26,10 @@ DEPEND="test? (
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/ubelt[${PYTHON_USEDEP}] )"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-python3_9.patch
+)
+
 distutils_enable_tests pytest
 
 python_test() {



[gentoo-commits] repo/gentoo:master commit in: dev-python/ubelt/

2020-11-18 Thread David Seifert
commit: b91478e915a6eb9aec21d00c4d4eb1bde6bbfb60
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Nov 18 18:57:46 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 18 18:57:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b91478e9

dev-python/ubelt: drop old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-python/ubelt/Manifest   |  1 -
 dev-python/ubelt/ubelt-0.8.8.ebuild | 27 ---
 2 files changed, 28 deletions(-)

diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index 1235f9899f2..b909b356d43 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,2 +1 @@
-DIST ubelt-0.8.8.tar.gz 172347 BLAKE2B 
94435bf8b5a5f67011540c43dd767393cda6bccf95b963ca74cf3ee72444de43828b87bd2e6aa93001fc2c7cd49e245c459b0bc8f2617f12da906ae4e3f194aa
 SHA512 
f63b3a9de51176d00a12999d540080e381266bb43b15942580f7f60b230b2e52021937b0cb4b31e084e0b77c141ae5cb3b8ae000d7af196e0c2f293a960e7438
 DIST ubelt-0.9.1.tar.gz 174866 BLAKE2B 
d9825cc266945e76560be0afaeaf28ce2c7ca99a9313f519c9e83fc987599a4d8c2d262af4f13040f522b91e3c73170f8af7fc7dbe9e40128b707d9a571f4b1a
 SHA512 
92edac331602ef292842d48cd03c3ae12aaaec7e5860fd47c83dbe0449dee584e95ce5dd157a0b84b557dc4f4b6a0ee66ccabb669c5923e9b9083daaa2eb92df

diff --git a/dev-python/ubelt/ubelt-0.8.8.ebuild 
b/dev-python/ubelt/ubelt-0.8.8.ebuild
deleted file mode 100644
index 51131ab8198..000
--- a/dev-python/ubelt/ubelt-0.8.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, 
Timing, Progress"
-HOMEPAGE="https://github.com/Erotemic/ubelt;
-SRC_URI="https://github.com/Erotemic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-   dev-python/ordered-set[${PYTHON_USEDEP}]"
-
-DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-   pytest -vv tests || die "Tests fail with ${EPYTHON}"
-}



[gentoo-commits] repo/gentoo:master commit in: dev-python/xdoctest/

2020-11-18 Thread David Seifert
commit: 492a1f75e6c9589897d5f3ff589edf98bd452d96
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Nov 18 18:57:37 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 18 18:57:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=492a1f75

dev-python/xdoctest: bump to 0.15.0, add py3_9, fix tests

Closes: https://bugs.gentoo.org/738486
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-python/xdoctest/Manifest   |  1 +
 dev-python/xdoctest/xdoctest-0.15.0.ebuild | 40 ++
 2 files changed, 41 insertions(+)

diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index b2f56e769ef..9dbf8a8dd74 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1 +1,2 @@
 DIST xdoctest-0.11.0.tar.gz 123871 BLAKE2B 
ef766ae79b1566a243abbb31671a6e57184196079cda146081c73cf4aa2583b612b438ea8ff031a1c3d4da612034bccb1990a954ad4d2af55546edd7f7085238
 SHA512 
63629435e976d2ece770b13432f1857127e7d9c9c954e11e904c1f25b1a9e82d5cf99ff912656260f6c4ed8b08e27ab0fb2d39e621d94ccac9c797fc294bcc62
+DIST xdoctest-0.15.0.tar.gz 629125 BLAKE2B 
f5144365c4d1d58c107ac0603a1d99cd5bc622d3772fc7f2c907193ea863d9ff99bd183cc7fac12e2f85b7647ba25d5ae6878c06d3df9a5cdda9a1f143b43110
 SHA512 
114add93a75807d787c674b0649f92ff011987705f640912f876c4a4c3103cef90b0fae1959d5a85ef399b80695e9cbfcae6e809950ff5651fa211f54326682d

diff --git a/dev-python/xdoctest/xdoctest-0.15.0.ebuild 
b/dev-python/xdoctest/xdoctest-0.15.0.ebuild
new file mode 100644
index 000..28bec16bbff
--- /dev/null
+++ b/dev-python/xdoctest/xdoctest-0.15.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A rewrite of Python's builtin doctest module but without all the 
weirdness"
+HOMEPAGE="https://github.com/Erotemic/xdoctest;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+   # fails because the ebuild environment location is not the expected 
location
+   sed -i -e 's:test_xdoc_console_script_location:_&:' \
+   testing/test_entry_point.py || die
+
+   # xdoctest has to be in PATH for this to work
+   sed -i -e 's:test_xdoc_console_script_exec:_&:' \
+   testing/test_entry_point.py || die
+
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   PYTHONPATH="${WORKDIR}/${P}"
+   pytest -vv || die "Test fail with ${EPYTHON}"
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/pywavelets/

2020-11-18 Thread David Seifert
commit: 383daf3398975a3b7169b9490503a8ce24aa1527
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Nov 18 18:57:28 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 18 18:57:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=383daf33

dev-python/pywavelets: add python3_9

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-python/pywavelets/pywavelets-1.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pywavelets/pywavelets-1.1.1.ebuild 
b/dev-python/pywavelets/pywavelets-1.1.1.ebuild
index de07fe47ec1..0c5b2fa68dd 100644
--- a/dev-python/pywavelets/pywavelets-1.1.1.ebuild
+++ b/dev-python/pywavelets/pywavelets-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/xdoctest/

2020-11-18 Thread David Seifert
commit: e14eb1edc8f6655ef0474a15ec55ab37c4b15cc9
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Nov 18 18:57:40 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 18 18:57:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e14eb1ed

dev-python/xdoctest: drop old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-python/xdoctest/Manifest   |  1 -
 dev-python/xdoctest/xdoctest-0.11.0.ebuild | 40 --
 2 files changed, 41 deletions(-)

diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index 9dbf8a8dd74..1cab8e34656 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1,2 +1 @@
-DIST xdoctest-0.11.0.tar.gz 123871 BLAKE2B 
ef766ae79b1566a243abbb31671a6e57184196079cda146081c73cf4aa2583b612b438ea8ff031a1c3d4da612034bccb1990a954ad4d2af55546edd7f7085238
 SHA512 
63629435e976d2ece770b13432f1857127e7d9c9c954e11e904c1f25b1a9e82d5cf99ff912656260f6c4ed8b08e27ab0fb2d39e621d94ccac9c797fc294bcc62
 DIST xdoctest-0.15.0.tar.gz 629125 BLAKE2B 
f5144365c4d1d58c107ac0603a1d99cd5bc622d3772fc7f2c907193ea863d9ff99bd183cc7fac12e2f85b7647ba25d5ae6878c06d3df9a5cdda9a1f143b43110
 SHA512 
114add93a75807d787c674b0649f92ff011987705f640912f876c4a4c3103cef90b0fae1959d5a85ef399b80695e9cbfcae6e809950ff5651fa211f54326682d

diff --git a/dev-python/xdoctest/xdoctest-0.11.0.ebuild 
b/dev-python/xdoctest/xdoctest-0.11.0.ebuild
deleted file mode 100644
index ddcfe852c5c..000
--- a/dev-python/xdoctest/xdoctest-0.11.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A rewrite of Python's builtin doctest module but without all the 
weirdness"
-HOMEPAGE="https://github.com/Erotemic/ubelt;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-   # fails because the ebuild environment location is not the expected 
location
-   sed -i -e 's:test_xdoc_console_script_location:_&:' \
-   testing/test_entry_point.py || die
-
-   # xdoctest has to be in PATH for this to work
-   sed -i -e 's:test_xdoc_console_script_exec:_&:' \
-   testing/test_entry_point.py || die
-
-   distutils-r1_python_prepare_all
-}
-
-python_test() {
-   PYTHONPATH="${WORKDIR}/${P}"
-   pytest -vv || die "Test fail with ${EPYTHON}"
-}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scikit-image/

2020-11-18 Thread David Seifert
commit: 12f85b525cc5e4d8476f54dbe73282a0aa2596e5
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Nov 18 18:57:34 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 18 18:57:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12f85b52

sci-libs/scikit-image: add python3_{8,9}

Closes: https://bugs.gentoo.org/754336
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-libs/scikit-image/scikit-image-0.17.2.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sci-libs/scikit-image/scikit-image-0.17.2.ebuild 
b/sci-libs/scikit-image/scikit-image-0.17.2.ebuild
index fe007d997ac..d88534989ef 100644
--- a/sci-libs/scikit-image/scikit-image-0.17.2.ebuild
+++ b/sci-libs/scikit-image/scikit-image-0.17.2.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-# 8,9 not on dev-python/pyamg
-PYTHON_COMPAT=( python3_{6..7} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 optfeature
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/imageio/

2020-11-18 Thread David Seifert
commit: 747485f1be9a1f909dc5f301abd25f18fe5d3478
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Nov 18 18:57:31 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 18 18:57:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=747485f1

dev-python/imageio: add python3_9

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-python/imageio/imageio-2.6.1.ebuild | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev-python/imageio/imageio-2.6.1.ebuild 
b/dev-python/imageio/imageio-2.6.1.ebuild
index 19e88cfe45e..83a2f758319 100644
--- a/dev-python/imageio/imageio-2.6.1.ebuild
+++ b/dev-python/imageio/imageio-2.6.1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
@@ -13,12 +14,9 @@ 
SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
media-libs/freeimage
 "
 DEPEND="${RDEPEND}"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"



[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/

2020-11-18 Thread David Seifert
commit: 6158cd122253e1e75132083031e72cd8158f0bd4
Author: Ionen Wolkens  gmail  com>
AuthorDate: Wed Nov 18 18:26:09 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 18 18:26:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6158cd12

x11-drivers/nvidia-drivers: revbumps to adjust gdk-pixbuf dep

gdk-pixbuf-xlib wasn't used by nvidia-settings, so [X] can safely be removed.

Closes: https://bugs.gentoo.org/753914
Signed-off-by: Ionen Wolkens  gmail.com>
Signed-off-by: David Seifert  gentoo.org>

 ...vidia-drivers-390.132-r4.ebuild => nvidia-drivers-390.132-r5.ebuild} | 2 +-
 ...vidia-drivers-390.138-r4.ebuild => nvidia-drivers-390.138-r5.ebuild} | 2 +-
 ...{nvidia-drivers-435.21-r6.ebuild => nvidia-drivers-435.21-r7.ebuild} | 2 +-
 ...vidia-drivers-440.100-r2.ebuild => nvidia-drivers-440.100-r3.ebuild} | 2 +-
 ...idia-drivers-450.80.02.ebuild => nvidia-drivers-450.80.02-r1.ebuild} | 2 +-
 .../{nvidia-drivers-455.28.ebuild => nvidia-drivers-455.28-r1.ebuild}   | 2 +-
 .../{nvidia-drivers-455.38.ebuild => nvidia-drivers-455.38-r1.ebuild}   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r4.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r5.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r4.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r5.ebuild
index 123424138e8..dc837fe77a4 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r4.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r5.ebuild
@@ -45,7 +45,7 @@ COMMON="
x11-libs/gtk+:3
)
x11-libs/cairo
-   x11-libs/gdk-pixbuf[X]
+   x11-libs/gdk-pixbuf
x11-libs/gtk+:2
x11-libs/libX11
x11-libs/libXext

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r4.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r5.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r4.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r5.ebuild
index 0aa995c49b6..882ac5f1686 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r4.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r5.ebuild
@@ -45,7 +45,7 @@ COMMON="
x11-libs/gtk+:3
)
x11-libs/cairo
-   x11-libs/gdk-pixbuf[X]
+   x11-libs/gdk-pixbuf
x11-libs/gtk+:2
x11-libs/libX11
x11-libs/libXext

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r6.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r7.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r6.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r7.ebuild
index 1cf485cc4a8..cd439460cca 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r6.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r7.ebuild
@@ -40,7 +40,7 @@ COMMON="
x11-libs/gtk+:3
)
x11-libs/cairo
-   x11-libs/gdk-pixbuf[X]
+   x11-libs/gdk-pixbuf
x11-libs/gtk+:2
x11-libs/libX11
x11-libs/libXext

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r2.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r3.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r2.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r3.ebuild
index d4cb4d9d301..f9b8f8b3486 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r3.ebuild
@@ -40,7 +40,7 @@ COMMON="
x11-libs/gtk+:3
)
x11-libs/cairo
-   x11-libs/gdk-pixbuf[X]
+   x11-libs/gdk-pixbuf
x11-libs/gtk+:2
x11-libs/libX11
x11-libs/libXext

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02-r1.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02-r1.ebuild
index ad31e621da6..3574dc2ad2d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02-r1.ebuild
@@ -40,7 +40,7 @@ COMMON="
x11-libs/gtk+:3
)
x11-libs/cairo
-   x11-libs/gdk-pixbuf[X]
+   x11-libs/gdk-pixbuf
x11-libs/gtk+:2
x11-libs/libX11
   

[gentoo-commits] repo/gentoo:master commit in: dev-embedded/stlink/

2020-11-18 Thread David Seifert
commit: bacfdf5fa50b1a049ada083c50ac8d50dfb3fded
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Nov 18 13:18:25 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 18 13:18:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bacfdf5f

dev-embedded/stlink: inherit xdg, port to cmake.eclass, fix BDEPEND

Closes: https://bugs.gentoo.org/754972
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-embedded/stlink/stlink-1.6.0.ebuild |  9 -
 dev-embedded/stlink/stlink-.ebuild  | 13 ++---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/dev-embedded/stlink/stlink-1.6.0.ebuild 
b/dev-embedded/stlink/stlink-1.6.0.ebuild
index 7d2549c15a3..0c5402c06fe 100644
--- a/dev-embedded/stlink/stlink-1.6.0.ebuild
+++ b/dev-embedded/stlink/stlink-1.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils udev
+inherit udev xdg cmake
 
 DESCRIPTION="stm32 discovery line linux programmer"
 HOMEPAGE="https://github.com/texane/stlink;
@@ -17,13 +17,12 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 
 RDEPEND="virtual/libusb:1
>=dev-libs/glib-2.32.0:2
x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
local mycmakeargs=(
@@ -33,5 +32,5 @@ src_configure() {
-DLIB_INSTALL_DIR:PATH="$(get_libdir)"
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }

diff --git a/dev-embedded/stlink/stlink-.ebuild 
b/dev-embedded/stlink/stlink-.ebuild
index cadef633bb8..0c5402c06fe 100644
--- a/dev-embedded/stlink/stlink-.ebuild
+++ b/dev-embedded/stlink/stlink-.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit cmake-utils udev
+inherit udev xdg cmake
 
 DESCRIPTION="stm32 discovery line linux programmer"
 HOMEPAGE="https://github.com/texane/stlink;
@@ -11,19 +11,18 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/texane/stlink.git;
inherit git-r3
 else
-   SRC_URI="https://github.com/texane/stlink/archive/${PV}/${P}.tar.gz;
+   SRC_URI="https://github.com/texane/stlink/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~amd64"
 fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 
 RDEPEND="virtual/libusb:1
>=dev-libs/glib-2.32.0:2
x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
local mycmakeargs=(
@@ -33,5 +32,5 @@ src_configure() {
-DLIB_INSTALL_DIR:PATH="$(get_libdir)"
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scikit-image/

2020-11-18 Thread David Seifert
commit: 2f7d7c1a0031029fb243b64fef24bf5a9faa2a3f
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Nov 18 13:18:21 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 18 13:18:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f7d7c1a

sci-libs/scikit-image: regenerate manifest

Closes: https://bugs.gentoo.org/755041
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-libs/scikit-image/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scikit-image/Manifest b/sci-libs/scikit-image/Manifest
index a9303cfafc7..f69f2243258 100644
--- a/sci-libs/scikit-image/Manifest
+++ b/sci-libs/scikit-image/Manifest
@@ -1,2 +1,2 @@
 DIST scikit-image-0.13.0.tar.gz 26101533 BLAKE2B 
c28284f64abd58c7bafa8f5f0c781496e8bb28af79c5c730df7cbf2fede958eb88ea420fd7f89e7b8d0d91719a98dd0935af3b2cc50fe501cc8d8d1d0ee56cb9
 SHA512 
923015e373c406ae2fbbfdf83ce8b91e83790bdf7842c4439fdc9fd58cffe46efc0cfc7a1b0b06e1b2d092a909a6f085335640850883e7608dbccd1074046550
-DIST scikit-image-0.17.2.tar.gz 22682646 BLAKE2B 
acfa38caff7aa2e1f724e173f544610e643976a40feb752040d2f20d49d871d19dddb34790bf846476932c771c260ad9bd210781439707d7c5f693c9a8fa021c
 SHA512 
3e57d8bea2fd41270eb17e8489c477f58ed98e56cef0192b0b2d455f27f7a2d705161afd61c7bfd556ec938a9a2bf5663ec1aa7b79609a8e5946806356364e82
+DIST scikit-image-0.17.2.tar.gz 29818001 BLAKE2B 
360c5f8c23b8441d145029c09a3b1d1407d4103463497c63274583e6c03d1fc57baa3e6c53909cfaa5daba54d5909fc106e84dc7036f0240ad8de93804ef9f65
 SHA512 
3ca2511f03d533ac7f1850d72de396dc5493831bce6200f30d426c3f47eff9b25ec9b69e141100dc56e03f2310aab255f92ff4aff8bc7b80d15d669cbe2ebb5e



[gentoo-commits] repo/gentoo:master commit in: media-sound/lollypop/

2020-11-18 Thread David Seifert
commit: 1c7346cc28e37480aae4f5f1d6fa5b0ecd3e580c
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Nov 18 13:18:28 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Wed Nov 18 13:18:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c7346cc

media-sound/lollypop: call xdg_pkg_preinst

Closes: https://bugs.gentoo.org/755011
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 media-sound/lollypop/lollypop-1.2.35.ebuild | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/media-sound/lollypop/lollypop-1.2.35.ebuild 
b/media-sound/lollypop/lollypop-1.2.35.ebuild
index fc57c94f636..70b5f2889b8 100644
--- a/media-sound/lollypop/lollypop-1.2.35.ebuild
+++ b/media-sound/lollypop/lollypop-1.2.35.ebuild
@@ -49,15 +49,16 @@ RDEPEND="${DEPEND}
 
 RESTRICT="test"
 
-pkg_preinst() {
-   gnome2_schemas_savelist
-}
-
 src_install() {
meson_src_install
python_optimize
 }
 
+pkg_preinst() {
+   gnome2_schemas_savelist
+   xdg_pkg_preinst
+}
+
 pkg_postinst() {
gnome2_gconf_install
gnome2_schemas_update



[gentoo-commits] repo/gentoo:master commit in: sci-libs/buddy/

2020-11-17 Thread David Seifert
commit: 90f227d0c692f72c54d3983260b942a8d0474194
Author: David Seifert  gentoo  org>
AuthorDate: Tue Nov 17 10:17:36 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Tue Nov 17 10:17:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90f227d0

sci-libs/buddy: Port to EAPI 7

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 sci-libs/buddy/buddy-2.4-r1.ebuild | 21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/sci-libs/buddy/buddy-2.4-r1.ebuild 
b/sci-libs/buddy/buddy-2.4-r1.ebuild
index c5dfddbbe1e..004107ea6cf 100644
--- a/sci-libs/buddy/buddy-2.4-r1.ebuild
+++ b/sci-libs/buddy/buddy-2.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit fortran-2
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="buddy"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
 
 DOCS=( doc/tech.txt )
 PATCHES=(
@@ -21,16 +21,21 @@ PATCHES=(
 )
 
 src_configure() {
-   econf $(use_enable static-libs static)
+   econf --disable-static
 }
 
 src_install() {
default
-
-   use doc && docinto ps && dodoc doc/*.ps
+   find "${ED}" -name '*.la' -delete || die
 
if use examples; then
-   insinto /usr/share/${PN}/
-   doins -r examples
+   find examples/ -name 'Makefile*' -delete || die
+
+   dodoc -r examples
+   docompress -x /usr/share/doc/${PF}/examples
+   fi
+   if use doc; then
+   docinto ps
+   dodoc doc/*.ps
fi
 }



[gentoo-commits] repo/gentoo:master commit in: dev-vcs/qgit/

2020-11-16 Thread David Seifert
commit: c0e718aeb37f01703ec46264c8c41e6e5fabed8c
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Nov 16 23:21:12 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Mon Nov 16 23:21:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0e718ae

dev-vcs/qgit: inherit xdg.eclass

Closes: https://bugs.gentoo.org/716022
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-vcs/qgit/qgit-2.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/qgit/qgit-2.9.ebuild b/dev-vcs/qgit/qgit-2.9.ebuild
index bcf86ac3f0d..ecec1123659 100644
--- a/dev-vcs/qgit/qgit-2.9.ebuild
+++ b/dev-vcs/qgit/qgit-2.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake
+inherit cmake xdg
 
 DESCRIPTION="Qt GUI for git repositories"
 HOMEPAGE="https://github.com/tibirna/qgit;



[gentoo-commits] repo/gentoo:master commit in: sci-calculators/wcalc/files/, sci-calculators/wcalc/

2020-11-16 Thread David Seifert
commit: e606af941b0e308edd7e4ee3dde23a41fcefea7c
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Nov 16 23:21:00 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Mon Nov 16 23:21:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e606af94

sci-calculators/wcalc: port to EAPI 7

Closes: https://bugs.gentoo.org/725378
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-calculators/wcalc/files/wcalc-2.5-AR.patch | 10 ++
 sci-calculators/wcalc/wcalc-2.5.ebuild | 13 ++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/sci-calculators/wcalc/files/wcalc-2.5-AR.patch 
b/sci-calculators/wcalc/files/wcalc-2.5-AR.patch
new file mode 100644
index 000..03291019d29
--- /dev/null
+++ b/sci-calculators/wcalc/files/wcalc-2.5-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
 b/configure.ac
+@@ -46,6 +46,7 @@ AC_PROG_CC
+ AC_PROG_CC_C99
+ AC_PROG_RANLIB
+ AC_PROG_YACC
++AM_PROG_AR
+ AM_PROG_LEX
+ AS_IF([test "x$LEX" == x],
+ [AC_MSG_ERROR([A Lex/Flex program is required in order to compile 
wcalc.])],

diff --git a/sci-calculators/wcalc/wcalc-2.5.ebuild 
b/sci-calculators/wcalc/wcalc-2.5.ebuild
index 9b9a8d8b67a..f7a5e03f83e 100644
--- a/sci-calculators/wcalc/wcalc-2.5.ebuild
+++ b/sci-calculators/wcalc/wcalc-2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils
+inherit autotools desktop
 
 DESCRIPTION="A flexible command-line scientific calculator"
 HOMEPAGE="http://w-calc.sourceforge.net/;
@@ -20,6 +20,13 @@ RDEPEND="
readline? ( sys-libs/readline:0= )"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-AR.patch )
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
 src_configure() {
econf $(use_with readline)
 }



[gentoo-commits] repo/gentoo:master commit in: dev-lang/maude/, dev-lang/maude/files/

2020-11-16 Thread David Seifert
commit: 2bd9aac8ca1a4d4015815f1bed718a478b439d57
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Nov 16 23:21:15 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Mon Nov 16 23:21:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd9aac8

dev-lang/maude: respect AR

Closes: https://github.com/gentoo/gentoo/pull/18281
Closes: https://bugs.gentoo.org/722966
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-lang/maude/files/maude-2.7-AR.patch | 10 ++
 dev-lang/maude/maude-2.7.ebuild |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/dev-lang/maude/files/maude-2.7-AR.patch 
b/dev-lang/maude/files/maude-2.7-AR.patch
new file mode 100644
index 000..0d172c8a8c4
--- /dev/null
+++ b/dev-lang/maude/files/maude-2.7-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
 b/configure.ac
+@@ -42,6 +42,7 @@ fi
+ #
+ AC_PROG_CC
+ AC_PROG_CXX
++AM_PROG_AR
+ if (test "$GXX" = yes) then
+   AC_MSG_CHECKING([g++ compiler version])
+   GXX_VERSION=`$CXX -dumpversion`

diff --git a/dev-lang/maude/maude-2.7.ebuild b/dev-lang/maude/maude-2.7.ebuild
index c871a47748f..01957fb2a5e 100644
--- a/dev-lang/maude/maude-2.7.ebuild
+++ b/dev-lang/maude/maude-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,6 +31,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.5.0-prll.patch"
"${FILESDIR}/${PN}-2.6-search-datadir.patch"
"${FILESDIR}/${PN}-2.7-bison-parse-param.patch"
+   "${FILESDIR}/${PN}-2.7-AR.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-sound/lollypop/

2020-11-16 Thread David Seifert
commit: f653eafeae8e4adf9090ea0fdf0d93280451ab20
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Nov 16 23:21:09 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Mon Nov 16 23:21:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f653eafe

media-sound/lollypop: inherit xdg.eclass

Closes: https://bugs.gentoo.org/738506
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 media-sound/lollypop/lollypop-1.2.35.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/lollypop/lollypop-1.2.35.ebuild 
b/media-sound/lollypop/lollypop-1.2.35.ebuild
index 8cc6542ee21..fc57c94f636 100644
--- a/media-sound/lollypop/lollypop-1.2.35.ebuild
+++ b/media-sound/lollypop/lollypop-1.2.35.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="sqlite"
-inherit python-single-r1 gnome2-utils meson xdg-utils
+inherit python-single-r1 gnome2-utils meson xdg
 
 DESCRIPTION="Modern music player for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop;
@@ -61,11 +61,11 @@ src_install() {
 pkg_postinst() {
gnome2_gconf_install
gnome2_schemas_update
-   xdg_desktop_database_update
+   xdg_pkg_postinst
 }
 
 pkg_postrm() {
gnome2_gconf_uninstall
gnome2_schemas_update
-   xdg_desktop_database_update
+   xdg_pkg_postrm
 }



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpich2/

2020-11-16 Thread David Seifert
commit: dc3959609c29c8edf547375ec2587f17082e9ba8
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Nov 16 23:21:03 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Mon Nov 16 23:21:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc395960

sys-cluster/mpich2: disable static libs

Closes: https://bugs.gentoo.org/458474
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sys-cluster/mpich2/mpich2-1.5.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/mpich2/mpich2-1.5.ebuild 
b/sys-cluster/mpich2/mpich2-1.5.ebuild
index e3e96c43c26..b896636 100644
--- a/sys-cluster/mpich2/mpich2-1.5.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -51,7 +51,7 @@ src_prepare() {
 }
 
 src_configure() {
-   local c="--enable-shared"
+   local c="--enable-shared --disable-static"
 
# The configure statements can be somewhat confusing, as they
# don't all show up in the top level configure, however, they
@@ -109,4 +109,6 @@ src_install() {
if ! use doc; then
rm -rf "${D}"usr/share/doc/${PF}/www*
fi
+
+   find "${ED}" -name '*.la' -delete || die
 }



[gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/

2020-11-16 Thread David Seifert
commit: 2d61b8def859012571a2e5321c2ba356669873f4
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Nov 16 23:21:06 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Mon Nov 16 23:21:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d61b8de

app-text/fbreader: inherit xdg.eclass

Closes: https://bugs.gentoo.org/745501
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 app-text/fbreader/fbreader-0.99.4-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild 
b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
index d309f9f7a5f..b3b298ab9d8 100644
--- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic qmake-utils
+inherit flag-o-matic qmake-utils xdg
 
 DESCRIPTION="E-Book Reader. Supports many e-book formats"
 HOMEPAGE="https://www.fbreader.org/;



[gentoo-commits] repo/gentoo:master commit in: games-fps/nexuiz/

2020-11-16 Thread David Seifert
commit: 770d11a6a24b61fdf001e97b1a33e52be7a8be09
Author: Alexey Sokolov  google  com>
AuthorDate: Mon Nov 16 21:45:57 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Mon Nov 16 21:45:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770d11a6

games-fps/nexuiz: stop using eutils eclass

Closes: https://github.com/gentoo/gentoo/pull/18288
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Alexey Sokolov  asokolov.org>
Signed-off-by: David Seifert  gentoo.org>

 games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild 
b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
index f5906fa0e09..68bb3ae1edc 100644
--- a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
+++ b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils toolchain-funcs
+inherit desktop toolchain-funcs
 
 MY_PN=Nexuiz
 MY_P=${PN}-${PV//./}



[gentoo-commits] repo/gentoo:master commit in: games-fps/nexuiz/

2020-11-16 Thread David Seifert
commit: 26bb54471ac2c096fef160d3eb68fbb3fd0eb9b6
Author: Alexey Sokolov  google  com>
AuthorDate: Mon Nov 16 21:45:51 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Mon Nov 16 21:45:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26bb5447

games-fps/nexuiz: correctly pass flags and compiler

Closes: https://bugs.gentoo.org/739288
Closes: https://bugs.gentoo.org/710826
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Alexey Sokolov  asokolov.org>
Signed-off-by: David Seifert  gentoo.org>

 games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild 
b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
index 2778fcff0c0..e23daea87d6 100644
--- a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
+++ b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils
+inherit eutils toolchain-funcs
 
 MY_PN=Nexuiz
 MY_P=${PN}-${PV//./}
@@ -69,9 +69,8 @@ src_prepare() {
 
# Make the game automatically look in the correct data directory
sed -i \
-   -e "/^CC=/d" \
-   -e "s:-O2:${CFLAGS}:" \
-   -e "/-lm/s:$: ${LDFLAGS}:" \
+   -e 's:-O2:$(CFLAGS):' \
+   -e '/-lm/s:$: $(LDFLAGS):' \
-e '/^STRIP/s/strip/true/' \
makefile.inc || die
 
@@ -88,6 +87,7 @@ src_prepare() {
 }
 
 src_compile() {
+   tc-export CC
if use opengl || ! use dedicated ; then
emake cl-${PN}
if use sdl ; then



[gentoo-commits] repo/gentoo:master commit in: games-fps/nexuiz/

2020-11-16 Thread David Seifert
commit: c22ae24873595b3730a2f9013c01ee8577c9275e
Author: Alexey Sokolov  google  com>
AuthorDate: Mon Nov 16 21:45:54 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Mon Nov 16 21:45:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c22ae248

games-fps/nexuiz: fix prefix

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Alexey Sokolov  asokolov.org>
Signed-off-by: David Seifert  gentoo.org>

 games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild 
b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
index e23daea87d6..f5906fa0e09 100644
--- a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
+++ b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
@@ -76,7 +76,7 @@ src_prepare() {
 
sed -i \
-e '1i DP_LINK_TO_LIBJPEG=1' \
-   -e "s:ifdef DP_.*:DP_FS_BASEDIR=/usr/share/${PN}\n&:" \
+   -e "s:ifdef DP_.*:DP_FS_BASEDIR=${EPREFIX}/usr/share/${PN}\n&:" 
\
makefile || die
 
if ! use alsa ; then



[gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack/

2020-11-16 Thread David Seifert
commit: 8c6d9a8fd2fce86f98e502acfc3cf2238da919a4
Author: David Seifert  gentoo  org>
AuthorDate: Mon Nov 16 09:52:51 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Mon Nov 16 09:52:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c6d9a8f

app-crypt/ophcrack: Port to EAPI 7

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 app-crypt/ophcrack/ophcrack-3.8.0.ebuild | 45 +---
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild 
b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
index c35c0f3c154..02782e37778 100644
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit eutils
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="A time-memory-trade-off-cracker"
 HOMEPAGE="http://ophcrack.sourceforge.net/;
@@ -13,32 +14,34 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug libressl qt5 +tables"
 
-CDEPEND="!libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   net-libs/netwib
-   qt5? ( dev-qt/qtcharts:5
-   dev-qt/qtgui:5 )"
-DEPEND="app-arch/unzip
-   virtual/pkgconfig
-   ${CDEPEND}"
-RDEPEND="tables? ( app-crypt/ophcrack-tables )
-   ${CDEPEND}"
-PATCHES=("${FILESDIR}/ophcrack-ar.patch")
+DEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   net-libs/netwib
+   qt5? (
+   dev-qt/qtcharts:5
+   dev-qt/qtgui:5
+   )"
+RDEPEND="
+   ${DEPEND}
+   tables? ( app-crypt/ophcrack-tables )"
+BDEPEND="
+   app-arch/unzip
+   virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/ophcrack-ar.patch )
 
 src_configure() {
+   tc-export AR
 
-   local myconf
-
-   myconf="$(use_enable debug)"
-   myconf="${myconf} $(use_enable qt5 gui)"
-
-   econf ${myconf}
+   econf \
+   $(use_enable debug) \
+   $(use_enable qt5 gui)
 }
 
 src_install() {
-   emake install DESTDIR="${D}"
+   default
 
-   cd "${S}"
newicon src/gui/pixmaps/os.xpm ophcrack.xpm
make_desktop_entry "${PN}" OphCrack ophcrack
 }



[gentoo-commits] repo/gentoo:master commit in: media-sound/spek/, media-sound/spek/files/

2020-11-16 Thread David Seifert
commit: da47b0e74bb59cdc66804a13bce61f1d4f335171
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Nov 16 09:39:40 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Mon Nov 16 09:39:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da47b0e7

media-sound/spek: respect AR

Closes: https://bugs.gentoo.org/754861
Closes: https://github.com/gentoo/gentoo/pull/18280
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Reported-by: Agostino Sarrubo  gentoo.org>
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 media-sound/spek/files/spek-0.8.3-AR.patch | 18 ++
 media-sound/spek/spek-0.8.3-r1.ebuild  |  1 +
 2 files changed, 19 insertions(+)

diff --git a/media-sound/spek/files/spek-0.8.3-AR.patch 
b/media-sound/spek/files/spek-0.8.3-AR.patch
new file mode 100644
index 000..be797ba663f
--- /dev/null
+++ b/media-sound/spek/files/spek-0.8.3-AR.patch
@@ -0,0 +1,18 @@
+Bug: https://bugs.gentoo.org/754861
+https://github.com/alexkay/spek/pull/198
+
+diff --git a/configure.ac b/configure.ac
+index 3fc451b..b270033 100644
+--- a/configure.ac
 b/configure.ac
+@@ -5,6 +5,7 @@ AM_INIT_AUTOMAKE([1.11.1 foreign no-dist-gzip dist-xz 
serial-tests])
+ AM_SILENT_RULES([yes])
+ 
+ AC_LANG([C++])
++AM_PROG_AR
+ AC_PROG_CXX
+ CXXFLAGS="$CXXFLAGS -std=gnu++11 -Wall -Wextra"
+ AC_PROG_CXXCPP
+-- 
+2.26.2
+

diff --git a/media-sound/spek/spek-0.8.3-r1.ebuild 
b/media-sound/spek/spek-0.8.3-r1.ebuild
index 7a4eb6af0e7..be7cff89511 100644
--- a/media-sound/spek/spek-0.8.3-r1.ebuild
+++ b/media-sound/spek/spek-0.8.3-r1.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
"${FILESDIR}"/${P}-stdlib.patch
"${FILESDIR}"/${P}-ffmpeg3.patch
"${FILESDIR}"/${P}-ffmpeg3-1.patch
+   "${FILESDIR}"/${P}-AR.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: net-libs/openmq-cclient/

2020-11-15 Thread David Seifert
commit: f7619eaede1fc6b8bd97d4827e19c5665f5d2d3a
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sun Nov 15 23:23:22 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 15 23:23:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7619eae

net-libs/openmq-cclient: disable static libs

Closes: https://bugs.gentoo.org/725016
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild 
b/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
index a60d88a6722..8fdd8ee4a31 100644
--- a/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
+++ b/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -73,6 +73,12 @@ src_prepare() {
eautoreconf
 }
 
+src_configure() {
+   econf --disable-static
+}
+
 src_install() {
-   emake install DESTDIR="${D}"
+   default
+   dodoc -r "${WORKDIR}"/mq/src/doc/en/.
+   find "${ED}" -name '*.la' -delete || die
 }



[gentoo-commits] repo/gentoo:master commit in: sys-fabric/libmlx5/

2020-11-15 Thread David Seifert
commit: e33ca0f6b29eb486f137e70f371b9571e151a8ff
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sun Nov 15 23:23:31 2020 +
Commit:     David Seifert  gentoo  org>
CommitDate: Sun Nov 15 23:23:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e33ca0f6

sys-fabric/libmlx5: disable static libs and Werror

Closes: https://bugs.gentoo.org/686100
Closes: https://bugs.gentoo.org/732220
Closes: https://github.com/gentoo/gentoo/pull/18272
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sys-fabric/libmlx5/libmlx5-1.0.1.ebuild | 27 +++
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/sys-fabric/libmlx5/libmlx5-1.0.1.ebuild 
b/sys-fabric/libmlx5/libmlx5-1.0.1.ebuild
index 4b7a5b45ba8..52884509e40 100644
--- a/sys-fabric/libmlx5/libmlx5-1.0.1.ebuild
+++ b/sys-fabric/libmlx5/libmlx5-1.0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 OFED_VER="3.12"
 OFED_RC="1"
@@ -12,11 +12,22 @@ inherit openib
 
 DESCRIPTION="OpenIB userspace driver for Mellanox ConnectIB HCA"
 KEYWORDS="amd64 ~x86 ~amd64-linux"
-IUSE=""
 
-DEPEND="
-   sys-fabric/libibverbs:${SLOT}
-   "
-RDEPEND="
-   !sys-fabric/openib-userspace"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
+RDEPEND="!sys-fabric/openib-userspace"
 block_other_ofed_versions
+
+src_prepare() {
+   default
+
+   sed -i -e '/CFLAGS=\"$CFLAGS -Werror\"/d' configure || die
+}
+
+src_configure() {
+   econf --disable-static
+}
+
+src_install() {
+   default
+   find "${ED}" -name '*.la' -delete || die
+}



  1   2   3   4   5   6   7   8   9   10   >