summaryrefslogtreecommitdiff
path: root/profiles
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/Manifest.gzbin156500 -> 156325 bytes
-rw-r--r--profiles/arch/arm64/package.use.mask3
-rw-r--r--profiles/package.mask56
-rw-r--r--profiles/thirdpartymirrors4
4 files changed, 63 insertions, 0 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index ee68ac42b0d5..8590e8b1df45 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
Binary files differ
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 342f099dbd1d..92213a34744d 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,10 +1,13 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+<<<<<<< HEAD
+=======
# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-09-27)
# some testsuite deps are not keyworded
sys-fs/zfs test-suite
+>>>>>>> next
# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
# iasl is keyworded ~arm64
sys-firmware/seabios -debug
diff --git a/profiles/package.mask b/profiles/package.mask
index 2ebdaee903ad..72798308a697 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,8 @@
#--- END OF EXAMPLES ---
+<<<<<<< HEAD
+=======
# Stefan Strogin <steils@gentoo.org> (2019-09-27)
# Requires >=dev-lang/lua-5.3 which is masked
>=dev-util/bam-0.5.0
@@ -44,6 +46,7 @@ virtual/python-pmw
# Blocks its own dependency. Bug #695606.
=x11-libs/libXvMC-1.0.12
+>>>>>>> next
# Joonas Niilola <juippis@gentoo.org> (2019-09-24)
# Upstream decided to deprecate this service, and app. Removal in
# ~30 days. Bug #695562
@@ -1096,6 +1099,59 @@ net-misc/libss7
games-rpg/eternal-lands-bloodsucker
games-rpg/eternal-lands-data
+<<<<<<< HEAD
+# Michał Górny <mgorny@gentoo.org> (2019-08-28)
+# Last touched in 2010. EAPI=0. Last upstream release in 2011 (pending
+# bump). No reverse dependencies.
+# Removal in 30 days. Bug #681168.
+dev-embedded/scratchbox
+dev-embedded/scratchbox-devkit-apt-https
+dev-embedded/scratchbox-devkit-cputransp
+dev-embedded/scratchbox-devkit-debian
+dev-embedded/scratchbox-devkit-debian-squeeze
+dev-embedded/scratchbox-devkit-doctools
+dev-embedded/scratchbox-devkit-git
+dev-embedded/scratchbox-devkit-maemo3
+dev-embedded/scratchbox-devkit-perl
+dev-embedded/scratchbox-devkit-qemu
+dev-embedded/scratchbox-devkit-svn
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-27)
+# Unmaintained. No release since 2008. Is reported to wrongly reject
+# 'pretty much all mails', also reported build failure.
+# Removal in 30 days. Bug #519668.
+mail-filter/sid-milter
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-27)
+# Fails to build against openssl-1.1. Not touched by Gentoo maintainer
+# who is also upstream since 2016, and the problem has been reported
+# in Jan 2019. Removal in 30 days. Bug #674800.
+app-crypt/af_alg
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-27)
+# Our version is seriously outdated and has numerous bugs reported,
+# including multilib-strict failures preventing it from being installed
+# on any modern system. It has not been touched since 2016, and is
+# many releases behind upstream. Furthermore, upstream has discontinued
+# it in favor of eeCodes.
+# Removal in 30 days. Bug #628746.
+sci-libs/grib_api
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-27)
+# Not touched since 2012. Homepage gone, and no replacement found.
+# No reverse dependencies.
+# Removal in 30 days. Bug #692796.
+dev-tcltk/tkTheme
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-27)
+# Discontinued upstream, in favor of Tokyo Tycoon. Last release
+# in 2010. Not touched by the Gentoo maintainer since 2010, with bugs
+# having to be addressed by other developers.
+# Removal in 30 days. Bug #681044.
+net-misc/tokyotyrant
+
+=======
+>>>>>>> next
# Miroslav Šulc <fordfrog@gentoo.org> (2019-08-19)
# Depends on >=virtual/{jdk,jre}-11 which is masked
=www-servers/tomcat-9.0.24
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index ccff6341312e..f24c1293174e 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -22,6 +22,10 @@ mysql https://artfiles.org/mysql/ https://www.mirrorservice.org/sites/ftp.mysql
nongnu http://download.savannah.nongnu.org/releases/ http://ftp.cc.uoc.gr/mirrors/nongnu.org/ http://ftp.twaren.net/Unix/NonGNU/ http://mirror.csclub.uwaterloo.ca/nongnu/ ftp://mirror.csclub.uwaterloo.ca/nongnu/ http://mirrors.fe.up.pt/pub/nongnu/ ftp://mirrors.fe.up.pt/pub/nongnu/ http://nongnu.askapache.com/ http://nongnu.uib.no/ ftp://nongnu.uib.no/pub/nongnu/ http://savannah.c3sl.ufpr.br/ ftp://savannah.c3sl.ufpr.br/savannah-nongnu/ ftp://ftp.twaren.net/Unix/NonGNU/
openbsd https://cdn.openbsd.org/pub/OpenBSD https://cloudflare.cdn.openbsd.org/pub/OpenBSD https://fastly.cdn.openbsd.org/pub/OpenBSD
openssl https://artfiles.org/openssl.org/ https://www.mirrorservice.org/sites/ftp.openssl.org/ ftp://ftp.openssl.org
+<<<<<<< HEAD
+postgresql https://ftp.postgresql.org/pub/
+=======
+>>>>>>> next
pypi https://pypi.org/packages/source https://files.pythonhosted.org/packages/source
qmail http://www.qmail.org/ http://qmail.geto.net/ http://qmail-mirror.jms1.net/ http://qmail.pandakc.com/ http://qmail.mirrors.auchnet.org/ http://qmail.glasswings.com.au/ http://qmail.ii.net/ http://infobase.ibase.com.hk/qmail/ http://qmail.morva.net/ http://qmail.teraren.com/ http://qmail.mirror.cdnetworks.com/ http://qmail.yongbok.net/ http://qmail.mirror.choon.net/ http://qmail.cbox.biz/ http://qmail.cbox.biz/ http://qmail.mirrors.ovh.net/ftp.qmail.org/ http://qmail.rasjonell.net/ http://qmail.europnews.de/ http://qmail.kendzorra.org/ http://qmail.mirror.gsnw.org/ http://mirrors.ntua.gr/qmail/ http://qmail.cti.gr/ http://qmail.dnsbeans.com/ http://qmail.hypergrid.it/ http://qmail.omnis.ch/ http://qmail.linorg.usp.br/ http://qmail.cavsystems.net/ http://qmail.mivzakim.net/ http://qmail.mirror.rise.ph/
quakeunity http://www.mirrorservice.org/sites/quakeunity.com