summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-i18n/scim/Manifest1
-rw-r--r--app-i18n/scim/scim-1.4.17.ebuild100
-rw-r--r--app-i18n/uim/Manifest1
-rw-r--r--app-i18n/uim/files/uim-1.8.6-gentoo.patch28
-rw-r--r--app-i18n/uim/files/uim-1.8.6-libressl.patch79
-rw-r--r--app-i18n/uim/files/uim-1.8.6-qt.patch16
-rw-r--r--app-i18n/uim/files/uim-1.8.6-tinfo.patch65
-rw-r--r--app-i18n/uim/uim-1.8.6-r1.ebuild209
-rw-r--r--app-i18n/uim/uim-1.8.6-r2.ebuild213
-rw-r--r--dev-perl/Class-Accessor/Class-Accessor-0.500.0.ebuild23
-rw-r--r--dev-perl/Class-Accessor/Manifest1
-rw-r--r--dev-ruby/brotli/Manifest1
-rw-r--r--dev-ruby/brotli/brotli-0.2.3.ebuild39
-rw-r--r--dev-ruby/brotli/metadata.xml (renamed from sys-apps/fwupdate/metadata.xml)8
-rw-r--r--dev-ruby/faraday_middleware/Manifest2
-rw-r--r--dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild (renamed from dev-ruby/faraday_middleware/faraday_middleware-0.13.1.ebuild)20
-rw-r--r--dev-ruby/faraday_middleware/metadata.xml3
-rw-r--r--dev-ruby/rantly/Manifest1
-rw-r--r--dev-ruby/rantly/metadata.xml11
-rw-r--r--dev-ruby/rantly/rantly-2.0.0.ebuild21
-rw-r--r--eclass/multilib.eclass5
-rw-r--r--games-misc/OilWar/Manifest2
-rw-r--r--games-misc/OilWar/OilWar-1.2.1-r2.ebuild57
-rw-r--r--games-misc/OilWar/metadata.xml8
-rw-r--r--media-fonts/symbola/Manifest2
-rw-r--r--media-fonts/symbola/metadata.xml12
-rw-r--r--media-fonts/symbola/symbola-8.00.ebuild31
-rw-r--r--media-fonts/symbola/symbola-9.17.ebuild31
-rw-r--r--profiles/package.mask19
-rw-r--r--sys-apps/fwupdate/Manifest2
-rw-r--r--sys-apps/fwupdate/fwupdate-10.ebuild48
-rw-r--r--sys-apps/fwupdate/fwupdate-12.ebuild49
32 files changed, 114 insertions, 994 deletions
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 13684813add0..3d55a28c3958 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,2 +1 @@
-DIST scim-1.4.17.tar.gz 1285383 BLAKE2B 95b9ecb0bb25a15876df8175ee0b9392c301e3b0c554ac6ccba6b863420828ce185d3454f2fef48c03e7451f01815020290be7611b8536d8a028153af3a3fe2b SHA512 a7e0696330bca6fdf929ec0565ab4af1b4d0e5f73592cf5cccf1af6412eb351cd5a5ec9a3e5b83b24d6abad89bbb38a375cbbb0fd978f2fa17f6d64b69da0e3a
DIST scim-1.4.18.tar.gz 1288060 BLAKE2B c2f1ce5608423734899aa6698060245c4ee253048d04d32bf5e853b8c68255340a8d35c0ebaaa50871b07c23ee9018b6bac03b18fbd4fa4dbea0e67c32c9ae30 SHA512 9a6090fc1ab950905a9c54d6678ce3d2a44297d1a992a3e933b0466688638e6cf470c1682daa58a6fbb6de3216b649273faf7edff1ac0ecca1c2c77fc19108fb
diff --git a/app-i18n/scim/scim-1.4.17.ebuild b/app-i18n/scim/scim-1.4.17.ebuild
deleted file mode 100644
index 1365db6b815e..000000000000
--- a/app-i18n/scim/scim-1.4.17.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic multilib gnome2-utils autotools qmake-utils
-
-DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
-HOMEPAGE="https://sourceforge.net/projects/scim"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
-IUSE="doc gtk3"
-
-RDEPEND="x11-libs/libX11
- dev-libs/glib:2
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- >=dev-libs/atk-1
- >=x11-libs/pango-1"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen
- >=app-text/docbook-xsl-stylesheets-1.73.1 )
- dev-lang/perl
- virtual/pkgconfig
- >=dev-util/intltool-0.33
- sys-devel/libtool"
-DOCS=(
- README
- AUTHORS
- ChangeLog
- docs/developers
- docs/scim.cfg
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # bug #83625
- filter-flags -fvisibility-inlines-hidden -fvisibility=hidden
- econf $(use_with doc doxygen) \
- --enable-ld-version-script \
- $(usex gtk3 --with-gtk-version={3,2}) \
- --disable-qt3-immodule \
- --disable-qt4-immodule
-}
-
-src_compile() {
- default
- use doc && emake docs
-}
-
-src_install() {
- use doc && HTML_DOCS=( "${S}/docs/html/" )
- default
-
- sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-${PN}" > "${T}/${PN}.conf" || die
- insinto /etc/X11/xinit/xinput.d
- doins "${T}/${PN}.conf"
-}
-
-pkg_postinst() {
- elog
- elog "To use SCIM with both GTK and XIM, you should use the following"
- elog "in your user startup scripts such as .gnomerc or .xinitrc:"
- elog
- elog "LANG='your_language' scim -d"
- elog "export XMODIFIERS=@im=SCIM"
- elog "export GTK_IM_MODULE=\"scim\""
- elog "export QT_IM_MODULE=\"scim\""
- elog
- elog "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other"
- elog "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8"
- elog
- elog "To use Chinese input methods:"
- elog " # emerge app-i18n/scim-tables app-i18n/scim-pinyin"
- elog "To use Korean input methods:"
- elog " # emerge app-i18n/scim-hangul"
- elog "To use Japanese input methods:"
- elog " # emerge app-i18n/scim-anthy"
- elog "To use various input methods (more than 30 languages):"
- elog " # emerge app-i18n/scim-m17n"
- elog
- elog "Please modify ${EPREFIX}/etc/scim/global and add your UTF-8 locale to"
- elog "/SupportedUnicodeLocales entry."
- elog
- ewarn
- ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
- ewarn
-
- gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
- gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 0e626d08dace..593def9c836a 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,2 +1 @@
-DIST uim-1.8.6.tar.bz2 6500739 BLAKE2B 78623c015cafafa1fbaf32542535de1f0207f8452a422d929a15f4421e4c9926192d0d3b761a7865a38affdf616dc5477e083c0fd8655261ff80ca817fd37029 SHA512 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
diff --git a/app-i18n/uim/files/uim-1.8.6-gentoo.patch b/app-i18n/uim/files/uim-1.8.6-gentoo.patch
deleted file mode 100644
index 0feee5a70997..000000000000
--- a/app-i18n/uim/files/uim-1.8.6-gentoo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,6 +36,7 @@
- AC_PATH_PROGS(SHA1, sha1 sha1sum)
- AC_PATH_PROGS(SED, sed gsed)
- AX_PATH_QMAKE4
-+PKG_PROG_PKG_CONFIG
-
- AM_MAINTAINER_MODE
-
-@@ -1792,7 +1793,7 @@
- fi
- AX_LANG_WNOERROR # end AC_LANG_WERROR
-
-- QT_CONFIG_OPTS="debug"
-+ QT_CONFIG_OPTS="debug nostrip"
- else
- CFLAGS="$CFLAGS -DNDEBUG"
- CXXFLAGS="$CXXFLAGS -DNDEBUG"
-@@ -1810,7 +1811,7 @@
- AX_CFLAGS_GCC_OPTION([-Wno-unused-variable], [SCIM_CFLAGS])
- AX_LANG_WNOERROR # end AC_LANG_WERROR
-
-- QT_CONFIG_OPTS="release"
-+ QT_CONFIG_OPTS="release nostrip"
- fi
-
- AC_ARG_ENABLE(warnings-into-error,
diff --git a/app-i18n/uim/files/uim-1.8.6-libressl.patch b/app-i18n/uim/files/uim-1.8.6-libressl.patch
deleted file mode 100644
index b14de58433aa..000000000000
--- a/app-i18n/uim/files/uim-1.8.6-libressl.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 7a281b1131399f04627986e6f9a54499b08e239d Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@posteo.de>
-Date: Thu, 21 Apr 2016 23:12:10 +0200
-Subject: [PATCH] Make openssl SSLv2 and SSLv3 support optional
-
-Fixes compilation with libressl
----
- uim/openssl.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
-diff --git a/uim/openssl.c b/uim/openssl.c
-index ba1b238..35ca1ca 100644
---- a/uim/openssl.c
-+++ b/uim/openssl.c
-@@ -208,34 +208,64 @@ c_SSL_write(uim_lisp s_, uim_lisp buf_)
- static uim_lisp
- c_SSLv2_method(void)
- {
-+#ifndef OPENSSL_NO_SSL2
- return MAKE_PTR(SSLv2_method());
-+#else
-+ uim_notify_fatal(N_("uim-openssl: SSLv2_method() is not supported on this system"));
-+ return uim_scm_f();
-+#endif
- }
- static uim_lisp
- c_SSLv2_server_method(void)
- {
-+#ifndef OPENSSL_NO_SSL2
- return MAKE_PTR(SSLv2_server_method());
-+#else
-+ uim_notify_fatal(N_("uim-openssl: SSLv2_server_method() is not supported on this system"));
-+ return uim_scm_f();
-+#endif
- }
- static uim_lisp
- c_SSLv2_client_method(void)
- {
-+#ifndef OPENSSL_NO_SSL2
- return MAKE_PTR(SSLv2_client_method());
-+#else
-+ uim_notify_fatal(N_("uim-openssl: SSLv2_client_method() is not supported on this system"));
-+ return uim_scm_f();
-+#endif
- }
-
- /* SSLv3 */
- static uim_lisp
- c_SSLv3_method(void)
- {
-+#ifndef OPENSSL_NO_SSL3
- return MAKE_PTR(SSLv3_method());
-+#else
-+ uim_notify_fatal(N_("uim-openssl: SSLv3_method() is not supported on this system"));
-+ return uim_scm_f();
-+#endif
- }
- static uim_lisp
- c_SSLv3_server_method(void)
- {
-+#ifndef OPENSSL_NO_SSL3
- return MAKE_PTR(SSLv3_server_method());
-+#else
-+ uim_notify_fatal(N_("uim-openssl: SSLv3_server_method() is not supported on this system"));
-+ return uim_scm_f();
-+#endif
- }
- static uim_lisp
- c_SSLv3_client_method(void)
- {
-+#ifndef OPENSSL_NO_SSL3
- return MAKE_PTR(SSLv3_client_method());
-+#else
-+ uim_notify_fatal(N_("uim-openssl: SSLv3_client_method() is not supported on this system"));
-+ return uim_scm_f();
-+#endif
- }
-
- /* SSLv3 but can rollback to v2 */
diff --git a/app-i18n/uim/files/uim-1.8.6-qt.patch b/app-i18n/uim/files/uim-1.8.6-qt.patch
deleted file mode 100644
index 6c0cb7eee667..000000000000
--- a/app-i18n/uim/files/uim-1.8.6-qt.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/m4/ax_path_qmake4.m4
-+++ b/m4/ax_path_qmake4.m4
-@@ -23,10 +23,10 @@
- # the copyright notice and this notice are preserved.
-
- AC_DEFUN([AX_PATH_QMAKE4], [
-- ax_guessed_qt4_dirs="/usr/lib/qt4/bin:/usr/local/lib/qt4/bin:/usr/qt4/bin:/usr/local/qt4/bin:${QT4DIR}/bin:${QTDIR}/bin"
-+ ax_guessed_qt4_dirs="${QT4DIR}/bin:${QTDIR}/bin"
- AC_PROG_EGREP
-- AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$PATH:$ax_guessed_qt4_dirs"])
-- AC_PATH_PROGS(_QMAKE, [qmake], [], ["$PATH:$ax_guessed_qt4_dirs"])
-+ AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$ax_guessed_qt4_dirs:$PATH"])
-+ AC_PATH_PROGS(_QMAKE, [qmake], [], ["$ax_guessed_qt4_dirs:$PATH"])
-
- AC_CACHE_CHECK([for Qt4 version of qmake], ax_cv_path_QMAKE4, [
- ax_cv_path_QMAKE4=no
diff --git a/app-i18n/uim/files/uim-1.8.6-tinfo.patch b/app-i18n/uim/files/uim-1.8.6-tinfo.patch
deleted file mode 100644
index 51105c909f54..000000000000
--- a/app-i18n/uim/files/uim-1.8.6-tinfo.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1058,27 +1058,25 @@
- ;;
- yes|*)
- use_uim_fep="yes"
-- AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
-- [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
-- AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
-- AC_CHECK_FUNCS(forkpty)
-- if test $ac_cv_func_forkpty = no; then
-- AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
-- fi
-- AC_SUBST(FEP_LIBADD)
- ;;
- esac
- ],
-- [ use_uim_fep="yes"
-- AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
-- [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
-- AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
-- AC_CHECK_FUNCS(forkpty)
-- if test $ac_cv_func_forkpty = no; then
-- AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
-- fi
-- AC_SUBST(FEP_LIBADD)
-- ])
-+ [use_uim_fep="yes"])
-+
-+if test "x$use_uim_fep" != "xno"; then
-+ PKG_CHECK_MODULES(CURSES, ncurses,
-+ [FEP_LIBADD="$CURSES_LIBS $FEP_LIBADD"],
-+ [
-+ AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
-+ [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
-+ AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
-+ ])
-+ AC_CHECK_FUNCS(forkpty)
-+ if test $ac_cv_func_forkpty = no; then
-+ AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
-+ fi
-+ AC_SUBST(FEP_LIBADD)
-+fi
-
- AC_ARG_ENABLE(emacs,
- AC_HELP_STRING([--disable-emacs],
-@@ -1210,10 +1208,14 @@
- saved_LDFLAGS=$LDFLAGS
- CPPFLAGS="${CPPFLAGS} -I$libedit_path/include"
- LDFLAGS="${LDFLAGS} -L$libedit_path/lib"
-- AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
-- [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
-- AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
-- use_libedit="no")])
-+ PKG_CHECK_MODULES(CURSES, ncurses,
-+ [LIBEDIT_LIBS="$CURSES_LIBS"],
-+ [
-+ AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
-+ [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
-+ AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
-+ use_libedit="no")])
-+ ])
- if test "x$use_libedit" != "xno"; then
- AC_CHECK_LIB(edit, el_init,
- [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS -L$libedit_path/lib"
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
deleted file mode 100644
index 5b032d6a9eab..000000000000
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools elisp-common gnome2-utils qmake-utils
-
-DESCRIPTION="A multilingual input method framework"
-HOMEPAGE="https://github.com/uim/uim"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls skk sqlite ssl static-libs xft"
-RESTRICT="test"
-REQUIRED_USE="gtk? ( X )
- gtk2? ( X )
- xft? ( X )"
-
-CDEPEND="!dev-scheme/sigscheme
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXrender
- x11-libs/libXt
- )
- anthy? ( app-i18n/anthy )
- canna? ( app-i18n/canna )
- curl? ( net-misc/curl )
- eb? ( dev-libs/eb )
- emacs? ( >=app-editors/emacs-23.1:* )
- expat? ( dev-libs/expat )
- libffi? ( virtual/libffi )
- gtk? ( x11-libs/gtk+:3 )
- gtk2? ( x11-libs/gtk+:2 )
- libedit? ( dev-libs/libedit )
- libnotify? ( x11-libs/libnotify )
- m17n-lib? ( dev-libs/m17n-lib )
- ncurses? ( sys-libs/ncurses:0= )
- nls? ( virtual/libintl )
- skk? ( app-i18n/skk-jisyo )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl:0 )"
-DEPEND="${CDEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
- X? ( x11-base/xorg-proto )"
-RDEPEND="${CDEPEND}
- X? (
- media-fonts/font-sony-misc
- l10n_ja? (
- || (
- media-fonts/font-jis-misc
- media-fonts/intlfonts
- )
- )
- l10n_ko? (
- || (
- media-fonts/font-daewoo-misc
- media-fonts/intlfonts
- )
- )
- l10n_zh-CN? (
- || (
- media-fonts/font-isas-misc
- media-fonts/intlfonts
- )
- )
- l10n_zh-TW? ( media-fonts/intlfonts )
- )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-qt.patch
- "${FILESDIR}"/${P}-tinfo.patch
- "${FILESDIR}"/${PN}-zh-TW.patch
-)
-DOCS=( AUTHORS NEWS README RELNOTE )
-
-AT_NO_RECURSIVE="yes"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
- default
- sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- $(use_with X x)
- $(use_with anthy anthy-utf8)
- $(use_with canna)
- $(use_with curl)
- $(use_with eb)
- $(use_enable emacs)
- $(use_with emacs lispdir "${SITELISP}")
- $(use_with expat)
- $(use_with libedit)
- $(use_with libffi ffi)
- $(use_with gtk gtk3)
- $(use_with gtk2)
- $(use_with m17n-lib m17nlib)
- $(use_enable ncurses fep)
- $(use_enable nls)
- --without-qt4
- --without-qt4-immodule
- --disable-qt4-qt3support
- $(use_with skk)
- $(use_with sqlite sqlite3)
- $(use_enable ssl openssl)
- $(use_enable static-libs static)
- $(use_with xft)
- --without-anthy
- --enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk))
- --disable-gnome-applet
- --disable-gnome3-applet
- --disable-kde-applet
- --disable-kde4-applet
- --without-mana
- --without-prime
- )
-
- if (use gtk || use gtk2) && (use anthy || use canna); then
- myconf+=( --enable-dict )
- else
- myconf+=( --disable-dict )
- fi
-
- if use libnotify; then
- myconf+=( --enable-notify=libnotify )
- fi
-
- if use gtk || use gtk2; then
- myconf+=( --enable-pref )
- else
- myconf+=( --disable-pref )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- default
-
- if use emacs; then
- cd emacs
- elisp-compile *.el || die
- fi
-}
-
-src_install() {
- # bug #222677
- emake -j1 DESTDIR="${D}" install
- einstalldocs
-
- find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
- use static-libs || find "${ED}" -name '*.la' -delete || die
-
- insinto /etc/X11/xinit/xinput.d
- sed \
- -e "s:@EPREFIX@:${EPREFIX}:g" \
- "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
- doins "${T}"/${PN}.conf
-
- if use emacs; then
- elisp-install ${PN}-el emacs/*.el{,c}
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
- fi
-}
-
-pkg_postinst() {
- elog "New input method switcher has been introduced. You need to set"
- elog
- elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
- elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
- elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
- elog
- elog "If you would like to use uim-anthy as default input method, put"
- elog "(define default-im-name 'anthy)"
- elog "to your ~/.uim."
- elog
- elog "All input methods can be found by running uim-im-switcher-gtk, "
- elog "uim-im-switcher-gtk3."
-
- if use emacs; then
- elisp-site-regen
- echo
- elog "uim is autoloaded with Emacs with a minimal set of features:"
- elog "There is no keybinding defined to call it directly, so please"
- elog "create one yourself and choose an input method."
- elog "Integration with LEIM is not done with this ebuild, please have"
- elog "a look at the documentation how to achieve this."
- fi
- use gtk && gnome2_query_immodules_gtk3
- use gtk2 && gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use gtk && gnome2_query_immodules_gtk3
- use gtk2 && gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
deleted file mode 100644
index 153a4f272422..000000000000
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools elisp-common gnome2-utils qmake-utils
-
-DESCRIPTION="A multilingual input method framework"
-HOMEPAGE="https://github.com/uim/uim"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls skk sqlite ssl static-libs xft"
-RESTRICT="test"
-REQUIRED_USE="gtk? ( X )
- gtk2? ( X )
- xft? ( X )"
-
-CDEPEND="!dev-scheme/sigscheme
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXrender
- x11-libs/libXt
- )
- anthy? ( app-i18n/anthy )
- canna? ( app-i18n/canna )
- curl? ( net-misc/curl )
- eb? ( dev-libs/eb )
- emacs? ( >=app-editors/emacs-23.1:* )
- expat? ( dev-libs/expat )
- libffi? ( virtual/libffi )
- gtk? ( x11-libs/gtk+:3 )
- gtk2? ( x11-libs/gtk+:2 )
- libedit? ( dev-libs/libedit )
- libnotify? ( x11-libs/libnotify )
- m17n-lib? ( dev-libs/m17n-lib )
- ncurses? ( sys-libs/ncurses:0= )
- nls? ( virtual/libintl )
- skk? ( app-i18n/skk-jisyo )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${CDEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
- X? ( x11-base/xorg-proto )"
-RDEPEND="${CDEPEND}
- X? (
- media-fonts/font-sony-misc
- l10n_ja? (
- || (
- media-fonts/font-jis-misc
- media-fonts/intlfonts
- )
- )
- l10n_ko? (
- || (
- media-fonts/font-daewoo-misc
- media-fonts/intlfonts
- )
- )
- l10n_zh-CN? (
- || (
- media-fonts/font-isas-misc
- media-fonts/intlfonts
- )
- )
- l10n_zh-TW? ( media-fonts/intlfonts )
- )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-libressl.patch
- "${FILESDIR}"/${P}-qt.patch
- "${FILESDIR}"/${P}-tinfo.patch
- "${FILESDIR}"/${PN}-zh-TW.patch
-)
-DOCS=( AUTHORS NEWS README RELNOTE )
-
-AT_NO_RECURSIVE="yes"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
- default
- sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- $(use_with X x)
- $(use_with anthy anthy-utf8)
- $(use_with canna)
- $(use_with curl)
- $(use_with eb)
- $(use_enable emacs)
- $(use_with emacs lispdir "${SITELISP}")
- $(use_with expat)
- $(use_with libedit)
- $(use_with libffi ffi)
- $(use_with gtk gtk3)
- $(use_with gtk2)
- $(use_with m17n-lib m17nlib)
- $(use_enable ncurses fep)
- $(use_enable nls)
- --without-qt4
- --without-qt4-immodule
- --disable-qt4-qt3support
- $(use_with skk)
- $(use_with sqlite sqlite3)
- $(use_enable ssl openssl)
- $(use_enable static-libs static)
- $(use_with xft)
- --without-anthy
- --enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk))
- --disable-gnome-applet
- --disable-gnome3-applet
- --disable-kde-applet
- --disable-kde4-applet
- --without-mana
- --without-prime
- )
-
- if (use gtk || use gtk2) && (use anthy || use canna); then
- myconf+=( --enable-dict )
- else
- myconf+=( --disable-dict )
- fi
-
- if use libnotify; then
- myconf+=( --enable-notify=libnotify )
- fi
-
- if use gtk || use gtk2; then
- myconf+=( --enable-pref )
- else
- myconf+=( --disable-pref )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- default
-
- if use emacs; then
- cd emacs
- elisp-compile *.el || die
- fi
-}
-
-src_install() {
- # bug #222677
- emake -j1 DESTDIR="${D}" install
- einstalldocs
-
- find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
- use static-libs || find "${ED}" -name '*.la' -delete || die
-
- insinto /etc/X11/xinit/xinput.d
- sed \
- -e "s:@EPREFIX@:${EPREFIX}:g" \
- "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
- doins "${T}"/${PN}.conf
-
- if use emacs; then
- elisp-install ${PN}-el emacs/*.el{,c}
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
- fi
-}
-
-pkg_postinst() {
- elog "New input method switcher has been introduced. You need to set"
- elog
- elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
- elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
- elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
- elog
- elog "If you would like to use uim-anthy as default input method, put"
- elog "(define default-im-name 'anthy)"
- elog "to your ~/.uim."
- elog
- elog "All input methods can be found by running uim-im-switcher-gtk, "
- elog "uim-im-switcher-gtk3."
-
- if use emacs; then
- elisp-site-regen
- echo
- elog "uim is autoloaded with Emacs with a minimal set of features:"
- elog "There is no keybinding defined to call it directly, so please"
- elog "create one yourself and choose an input method."
- elog "Integration with LEIM is not done with this ebuild, please have"
- elog "a look at the documentation how to achieve this."
- fi
- use gtk && gnome2_query_immodules_gtk3
- use gtk2 && gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use gtk && gnome2_query_immodules_gtk3
- use gtk2 && gnome2_query_immodules_gtk2
-}
diff --git a/dev-perl/Class-Accessor/Class-Accessor-0.500.0.ebuild b/dev-perl/Class-Accessor/Class-Accessor-0.500.0.ebuild
new file mode 100644
index 000000000000..79031890270b
--- /dev/null
+++ b/dev-perl/Class-Accessor/Class-Accessor-0.500.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=KASEI
+DIST_VERSION=0.50
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Automated accessor generation"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+RDEPEND="dev-perl/Sub-Name"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-Test-Simple
+ )
+"
diff --git a/dev-perl/Class-Accessor/Manifest b/dev-perl/Class-Accessor/Manifest
index 97332b5c3cb8..f9c918cd80ab 100644
--- a/dev-perl/Class-Accessor/Manifest
+++ b/dev-perl/Class-Accessor/Manifest
@@ -1 +1,2 @@
DIST Class-Accessor-0.34.tar.gz 12315 BLAKE2B 8dfc65c7b9f7d63112b6991b0ac3c8c93146fac2f800425ba88281f70ab9c5f27a00f7c2f0eca9cc92dd5391dabc24f7fd3d987075d421e26f1fe5dee77218f8 SHA512 a2978e5b8a7b080ef85e2b2499ee7263c9b5b8a70effc00a04e18fe92694fd59331b50b8162d3b8a6cb48ebedccca3b4780ec0984e6b8728b130a49781e35ee4
+DIST Class-Accessor-0.50.tar.gz 12998 BLAKE2B 067920502bbad3e941d4b70ed325b46821cd2817bc5b2f222693375c07f3c4deb2a69ff3ced59a5ed18abd7aa1f0dad5fb28d0c225a88db5a83abcf887db668a SHA512 e36520805fc5cf404c48bf252dd0cc3cb3298d472b31a8d4b6dde08316e93b9a45527df47ba8d848c29fe5dcfbbfb021eb8ed2565a56aec2896c1362b9ae05b8
diff --git a/dev-ruby/brotli/Manifest b/dev-ruby/brotli/Manifest
new file mode 100644
index 000000000000..98e45ea64d1c
--- /dev/null
+++ b/dev-ruby/brotli/Manifest
@@ -0,0 +1 @@
+DIST brotli-0.2.3.tar.gz 63304 BLAKE2B 96321a480e855ae7e77b93c06fd09153611a8a273ba66a8952093f844f6ccfa908d4bcabfd4dde084813f7f3961e8843208ed71f78e91f924bfe7e2ddece3628 SHA512 7d057d0055836c79744b802bb2401630375cc924035e9a45069c54e5df32711b9aa25234f4743aea729526028b804c518f36112ab721a6761b55311d07a8b79e
diff --git a/dev-ruby/brotli/brotli-0.2.3.ebuild b/dev-ruby/brotli/brotli-0.2.3.ebuild
new file mode 100644
index 000000000000..fab2f12fe16f
--- /dev/null
+++ b/dev-ruby/brotli/brotli-0.2.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="brotli.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Brotli compressor/decompressor"
+HOMEPAGE="https://github.com/miyucy/brotli"
+SRC_URI="https://github.com/miyucy/brotli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND+=" >=app-arch/brotli-1.0.7"
+DEPEND+=" >=app-arch/brotli-1.0.7"
+
+# Depends on the test data in app-arch/brotli
+RESTRICT="test"
+
+each_ruby_configure() {
+ ${RUBY} -Cext/brotli extconf.rb || die
+}
+
+each_ruby_compile() {
+ emake V=1 -Cext/brotli
+ mv ext/brotli/brotli.so lib/brotli/ || die
+}
diff --git a/sys-apps/fwupdate/metadata.xml b/dev-ruby/brotli/metadata.xml
index ce6167e42309..eb5be24aa567 100644
--- a/sys-apps/fwupdate/metadata.xml
+++ b/dev-ruby/brotli/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
+ <maintainer type="project">
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
</maintainer>
<upstream>
- <remote-id type="github">rhinstaller/fwupdate</remote-id>
+ <remote-id type="github">miyucy/brotli</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index 90c83bd07f0f..32a370655925 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,2 +1,2 @@
-DIST faraday_middleware-0.13.1.tar.gz 25728 BLAKE2B 7899d9115ad4e93ab1dedecfe5147fc425c5f884f66e473870542662b93e616e48392d7c564079fc55dfc7ffc09f5983d8a481894f295b88178d15ac05e2b312 SHA512 ea58c14e4e45cf1118281f42861df2e54c97ed92ab25d1de68a9d9da73b1ace378d464140ac8c0e42c5b36d5b0cd5f760092727c49da26c10b4e2566af9ab768
DIST faraday_middleware-0.14.0.tar.gz 26313 BLAKE2B 2d925f0bd9e4a10505bcdd3b483ac7b8ed2c42dc1187e04069505216dc739af3f10f5c7f2252e3f474e5ddaf972a7b8fe009be9957e66ab625fe49c364a0d217 SHA512 d8e86da166022c04c12acc37981de446ba30050330dc0320eec0414157bdd6c8e92ff49ce92b390a2f5d457c396144dbde698d61993302c0ac416559e7078a8d
+DIST faraday_middleware-1.0.0.tar.gz 28279 BLAKE2B d881f59e106a695e2d41936d552fe6cb16465964fcb2107806123ea1b34ee6db8e82bb1e6fe3a0135af04da70b56a3e8c933e44591b3f75901642a1fe7a3ea1a SHA512 478dd04840c27120c162e5d9c764a210d4cc55ac54f2d44935942ab5195ee5a0f198a4cc0c98805029f3eab4596cc3963a763cda1fcc1ce6daf1811186e0b5a7
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.13.1.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
index d82d4eed3f29..21c8c5a7e5bc 100644
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.13.1.ebuild
+++ b/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="README.md"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
@@ -19,12 +18,12 @@ HOMEPAGE="https://github.com/lostisland/faraday_middleware"
SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
-SLOT="0"
+SLOT="$(ver_cut 1)"
KEYWORDS="~amd64"
IUSE="+parsexml +oauth +mashify +rashify"
ruby_add_rdepend "
- >=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-1
+ dev-ruby/faraday:1
parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
oauth? ( >=dev-ruby/simple_oauth-0.1 )
mashify? ( >=dev-ruby/hashie-1.2:* )
@@ -35,7 +34,7 @@ ruby_add_rdepend "
ruby_add_bdepend "test? (
dev-ruby/bundler
dev-ruby/addressable
- dev-ruby/rake
+ >=dev-ruby/rake-12.3.3
dev-ruby/webmock:3
dev-ruby/json
>=dev-ruby/multi_xml-0.5.3
@@ -45,20 +44,15 @@ ruby_add_bdepend "test? (
>=dev-ruby/rash_alt-0.4.3 )"
all_ruby_prepare() {
- sed -i -e '/\(cane\|parallel\|simplecov\|brotli\)/ s:^:#:' \
+ sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \
-e '/rspec/ s/>=/~>/' \
-e "/addressable/ s/, '< 2.4'//" \
- -e "/rake/ s/, '< 11'//" \
-e "/rack-cache/ s/, '< 1.3'//" \
-e "/simple_oauth/ s/, '< 0.3'//" \
-e "/webmock/ s/< 2/~> 3.0/" Gemfile || die
# Avoid unneeded dependency on git
sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
- # Avoid unpackaged brotli dependency
- sed -i -e 's/jruby?/true/' \
- -e 's/gzip,deflate,br/gzip,deflate/' spec/unit/gzip_spec.rb || die
}
each_ruby_test() {
diff --git a/dev-ruby/faraday_middleware/metadata.xml b/dev-ruby/faraday_middleware/metadata.xml
index 308ea2abc418..38d121a1191a 100644
--- a/dev-ruby/faraday_middleware/metadata.xml
+++ b/dev-ruby/faraday_middleware/metadata.xml
@@ -9,9 +9,6 @@
<email>ruby@gentoo.org</email>
<name>Gentoo Ruby Project</name>
</maintainer>
- <longdescription lang="en">
- A collection of useful Faraday middleware.
- </longdescription>
<use>
<flag name="parsexml">Include FaradayMiddleware::ParseXml</flag>
<flag name="oauth">Include FaradayMiddleware::OAuth</flag>
diff --git a/dev-ruby/rantly/Manifest b/dev-ruby/rantly/Manifest
new file mode 100644
index 000000000000..9d56297e35c4
--- /dev/null
+++ b/dev-ruby/rantly/Manifest
@@ -0,0 +1 @@
+DIST rantly-2.0.0.gem 18944 BLAKE2B a124204157953780dfcc97c4777dc3fb7e152eb3f0e208dd18aff80f8252b4f41285ce7870d927433e034678e679e0a735b8796601dd061ce43693f2c3760d50 SHA512 f3eb10eb3fea3135797c57d40bfe6a2ac9d64d4f449850b89072c527913f13eca34507f62ce611831497954b1c28bf5592dc46b73b510503223d029b4b442b74
diff --git a/dev-ruby/rantly/metadata.xml b/dev-ruby/rantly/metadata.xml
new file mode 100644
index 000000000000..a17d9e1e71c4
--- /dev/null
+++ b/dev-ruby/rantly/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">rantly-rb/rantly</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/rantly/rantly-2.0.0.ebuild b/dev-ruby/rantly/rantly-2.0.0.ebuild
new file mode 100644
index 000000000000..4c2e275a6cc1
--- /dev/null
+++ b/dev-ruby/rantly/rantly-2.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby Imperative Random Data Generator and Quickcheck"
+HOMEPAGE="https://github.com/rantly-rb/rantly"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+each_ruby_test() {
+ ${RUBY} -Ilib:test:. -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index bbaab709b4fa..acfb78deab1f 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -484,11 +484,16 @@ multilib_toolchain_setup() {
# Set the CHOST native first so that we pick up the native
# toolchain and not a cross-compiler by accident #202811.
export CHOST=$(get_abi_CHOST ${DEFAULT_ABI})
+ export AR="$(tc-getAR)" # Avoid 'ar', use '${CHOST}-ar'
export CC="$(tc-getCC) $(get_abi_CFLAGS)"
export CXX="$(tc-getCXX) $(get_abi_CFLAGS)"
export F77="$(tc-getF77) $(get_abi_CFLAGS)"
export FC="$(tc-getFC) $(get_abi_CFLAGS)"
export LD="$(tc-getLD) $(get_abi_LDFLAGS)"
+ export NM="$(tc-getNM)" # Avoid 'nm', use '${CHOST}-nm'
+ export OBJDUMP="$(tc-getOBJDUMP)" # Avoid 'objdump', use '${CHOST}-objdump'
+ export RANLIB="$(tc-getRANLIB)" # Avoid 'ranlib', use '${CHOST}-ranlib'
+ export STRIP="$(tc-getSTRIP)" # Avoid 'strip', use '${CHOST}-strip'
export CHOST=$(get_abi_CHOST $1)
export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig
diff --git a/games-misc/OilWar/Manifest b/games-misc/OilWar/Manifest
deleted file mode 100644
index 5c24b68bb2f5..000000000000
--- a/games-misc/OilWar/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST OilWar-1.2.1.tar.gz 515013 BLAKE2B 44c7950168e9ba9d7cc0c068ca0abeba4249bbab43d89663bcf2e752e10e680a7ea8a09eb2c983ce5948e65e0609cd9de920997eddf45702e54109819c019137 SHA512 303581caf1cb59a4623b136595e0c1af6f682ae4c059a8848b481b42dee622083d436edb86ca9073edcf4c573f8a73b284dddea89cb8013943ef4ec81b3e17a1
-DIST OilWar.png 2961 BLAKE2B c7270884148e8712b93c44de532a902e807a58507ba5fd509ad020556d90d9a54d24a3243ced7c1de3d41635654397747cbd79d93e82ad6fa231c7eb9c0fb14e SHA512 75bd4c18791593f0bb81b51d87f6f033e2ebebe6de3653276b14e852d3625f01a61fb34257eb3d15ebf265908563f2820793b84196138b39c9329839e8fefe2d
diff --git a/games-misc/OilWar/OilWar-1.2.1-r2.ebuild b/games-misc/OilWar/OilWar-1.2.1-r2.ebuild
deleted file mode 100644
index 4e28b012ebf7..000000000000
--- a/games-misc/OilWar/OilWar-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils
-
-DESCRIPTION="Evil army is attacking your country and tries to steal your oil"
-HOMEPAGE="http://linux.softpedia.com/get/GAMES-ENTERTAINMENT/RTS/OilWar-15354.shtml"
-SRC_URI="mirror://gentoo/${P}.tar.gz
- mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="acct-group/gamestat
- media-libs/libsdl[video]
- media-libs/sdl-image[png]
- media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
-
- sed -i \
- -e '/^CXXCOMPILE/s:$(CPPFLAGS):$(SDL_CFLAGS):' \
- -e '/install-data-am:/s:\\::' \
- -e '/install-data-local$/d' \
- Makefile.in || die
-}
-
-src_configure() {
- econf --enable-sound
-}
-
-src_install() {
- default
- doicon "${DISTDIR}"/${PN}.png
- make_desktop_entry oilwar ${PN}
-
- fowners root:gamestat /usr/bin/oilwar /var/games/oilwar.scores
- fperms 664 /var/games/oilwar.scores
- fperms 2755 /usr/bin/oilwar
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-misc/OilWar/metadata.xml b/games-misc/OilWar/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/OilWar/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-fonts/symbola/Manifest b/media-fonts/symbola/Manifest
deleted file mode 100644
index 4b23aae1c814..000000000000
--- a/media-fonts/symbola/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST symbola-8.00.zip 4668110 BLAKE2B 2807945aaab54509921756792da89d31721b575f6a1a4f65426b69ec348d1a6bf21d457d1c7a78205042c9df67187bce7c56f9bb4ba42b9f6f5f5af6ef9608cf SHA512 f496be58660c5d07fd0a9422eef1dad3d0aa06e350e37f84a547496a6a9c6abf6fa4609e9051e40772e952cd4f71a7dd02ad0ba16cf3aa2b51f31fee09ef9b84
-DIST symbola-9.17.zip 4122777 BLAKE2B 60e7188366ff9204c41e42b99ee31242c0d2eefceb2bf663e6b68bb5a924a269d608d8ba2085e956dcb5d4c2c85d7a2993f199bdf8e0597d27e3d4bc34c50be6 SHA512 29c2141ba7d5be96b4d2faa52e4d2efbd1ff6a8368fdeae8986a4a3de50522a813c46efd462556b5b6c10bb97777ca068564b9dcdfd7961c485ece5fda18e04c
diff --git a/media-fonts/symbola/metadata.xml b/media-fonts/symbola/metadata.xml
deleted file mode 100644
index 7c26ab55771f..000000000000
--- a/media-fonts/symbola/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>chithanh@gentoo.org</email>
- <name>Chí-Thanh Christopher Nguyễn</name>
- </maintainer>
-<maintainer type="project">
- <email>fonts@gentoo.org</email>
- <name>Fonts</name>
- </maintainer>
-</pkgmetadata>
diff --git a/media-fonts/symbola/symbola-8.00.ebuild b/media-fonts/symbola/symbola-8.00.ebuild
deleted file mode 100644
index 2ceca26441ba..000000000000
--- a/media-fonts/symbola/symbola-8.00.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="${PN/s/S}"
-
-inherit font
-
-DESCRIPTION="Unicode font for Latin, IPA Extensions, Greek, Cyrillic and many Symbol Blocks"
-HOMEPAGE="http://users.teilar.gr/~g1951d/"
-SRC_URI="http://users.teilar.gr/~g1951d/${MY_PN}.zip -> ${P}.zip"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86"
-IUSE="doc"
-RESTRICT="mirror bindist"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-
-src_prepare() {
- if use doc; then
- DOCS="${MY_PN}.docx ${MY_PN}.pdf"
- fi
-}
diff --git a/media-fonts/symbola/symbola-9.17.ebuild b/media-fonts/symbola/symbola-9.17.ebuild
deleted file mode 100644
index 88a01a52e29e..000000000000
--- a/media-fonts/symbola/symbola-9.17.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="${PN/s/S}"
-
-inherit font
-
-DESCRIPTION="Unicode font for Latin, IPA Extensions, Greek, Cyrillic and many Symbol Blocks"
-HOMEPAGE="http://users.teilar.gr/~g1951d/"
-SRC_URI="http://users.teilar.gr/~g1951d/${MY_PN}.zip -> ${P}.zip"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86"
-IUSE="doc"
-RESTRICT="mirror bindist"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-
-src_prepare() {
- if use doc; then
- DOCS="${MY_PN}.pdf"
- fi
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index e8b21676b123..6d37c5bc8294 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -671,11 +671,6 @@ dev-python/invoke
# Removal in 30 days. Bug #701820.
net-misc/ssvnc
-# Lars Wendler <polynomial-c@gentoo.org> (2020-04-13)
-# Discontinued by upstream. Superseded by sys-apps/fwupd.
-# Masked for removal in 30 days.
-sys-apps/fwupdate
-
# Matt Turner <mattst88@gentoo.org> (2020-04-12)
# In conjunction with Firefox's sandbox, breaks loading of i965 driver.
# Bug #716574
@@ -691,13 +686,6 @@ dev-tcltk/tcl-mccp
# Introduced new privsep (chroot) feature. Masked for testing.
>=net-misc/dhcpcd-9.0.0
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (2020-03-29)
-# Old releases gone from upstream, new releases use overly restrictive
-# license. For ancient scripts and symbols, use media-fonts/quivira instead.
-# For emojis and pictographs, use media-fonts/noto-emoji instead.
-# Masked for removal in 30 days, bug #715226
-media-fonts/symbola
-
# Michał Górny <mgorny@gentoo.org> (2020-03-29)
# Unmaintained, seriously outdated, vulnerable. Multiple bugs reported.
# Stuck on Python 3.6.
@@ -744,13 +732,6 @@ net-misc/gns3-converter
net-misc/gns3-gui
net-misc/gns3-server
-# Jonas Stein <jstein@gentoo.org> (2020-03-21)
-# Package masked for removal. Broken SRC_URI,
-# upstream is dead.
-# Bug #458662
-# Removal after 2020-05-01
-games-misc/OilWar
-
# Andreas Sturmlechner <asturm@gentoo.org> (2020-03-14)
# Breaks at least dev-games/simgear right now, bug #709878.
~dev-games/openscenegraph-3.6.5
diff --git a/sys-apps/fwupdate/Manifest b/sys-apps/fwupdate/Manifest
deleted file mode 100644
index 1d97b111b855..000000000000
--- a/sys-apps/fwupdate/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST fwupdate-10.tar.gz 55899 BLAKE2B 34e74386de5151a977d0e136ac4d022a42d339775c77525fa26a2669ad7b10da2c0882435ac6093cd69d56473b83234c9d808f12565ab029a4f14c006ce6a1d8 SHA512 7c01a41a8c2876a954a1047790b45999c07416eeafffdf5a0802c53a877ca300811bc2282cb9398e46df53f761404a8fe4ef8caa1995f326122dbae2af1018da
-DIST fwupdate-12.tar.gz 61523 BLAKE2B 4adb26e50b69f4c0aeef9e0287dd520f396b3e433e4018651ad125406a1bd160e673da55923c2764c126c1d53d1f12a65c2dd7d9b9e688411ca31426e7b7103f SHA512 1681e97982b22084cb3ca38e2965ce25c4cf72dd0afd2268f0a2612c6aa90b3030e4b6bfa64f42e504a680d60c5e623462238fa148a60359725db0a835dac193
diff --git a/sys-apps/fwupdate/fwupdate-10.ebuild b/sys-apps/fwupdate/fwupdate-10.ebuild
deleted file mode 100644
index e568ed34d907..000000000000
--- a/sys-apps/fwupdate/fwupdate-10.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 mount-boot toolchain-funcs
-
-DESCRIPTION="Tools for using the ESRT and UpdateCapsule() to apply firmware updates"
-HOMEPAGE="https://github.com/rhinstaller/fwupdate"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/popt
- >=sys-libs/efivar-32-r1
- >=sys-libs/libsmbios-2.3.3
-"
-DEPEND="
- ${RDEPEND}
- sys-boot/gnu-efi
-"
-
-do_make() {
- emake \
- CC="$(tc-getCC)" \
- EFIDIR="gentoo" \
- GNUEFIDIR="/usr/$(get_libdir)" \
- "${@}"
-}
-
-src_prepare() {
- default
-
- # Remove -Werror
- sed 's@ -Werror\([[:space:]]\|\n\)@\1@' -i linux/Makefile || die
-}
-
-src_compile() {
- do_make
-}
-
-src_install() {
- do_make DESTDIR="${D}" install
-}
diff --git a/sys-apps/fwupdate/fwupdate-12.ebuild b/sys-apps/fwupdate/fwupdate-12.ebuild
deleted file mode 100644
index 77dcb16f8ac6..000000000000
--- a/sys-apps/fwupdate/fwupdate-12.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot toolchain-funcs
-
-DESCRIPTION="Tools for using the ESRT and UpdateCapsule() to apply firmware updates"
-HOMEPAGE="https://github.com/rhinstaller/fwupdate"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/popt
- >=sys-libs/efivar-32-r1
- >=sys-libs/libsmbios-2.3.3
-"
-DEPEND="
- ${RDEPEND}
- sys-boot/gnu-efi
-"
-
-do_make() {
- emake \
- CC="$(tc-getCC)" \
- EFIDIR="gentoo" \
- GNUEFIDIR="/usr/$(get_libdir)" \
- "${@}"
-}
-
-src_prepare() {
- default
-
- # Remove -Werror
- sed 's@ -Werror\([[:space:]]\|\n\)@\1@' -i linux/Makefile || die
-}
-
-src_compile() {
- do_make
-}
-
-src_install() {
- do_make DESTDIR="${D}" install
- keepdir /var/lib/${PN}
-}