diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2019-12-22 11:25:33 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2019-12-22 11:25:33 +0000 |
| commit | 4bfe16cf2b0a3f410ed2e2fc2a9bec7f4f73ffc2 (patch) | |
| tree | c260690d178a2e2d8efb0125e1a2cfd45da11e3b | |
| parent | 2019-12-22 11:05:50 UTC (diff) | |
| parent | elisp-common.eclass: Add missing argument to eend. (diff) | |
| download | gentoo-4bfe16cf2b0a3f410ed2e2fc2a9bec7f4f73ffc2.tar.gz gentoo-4bfe16cf2b0a3f410ed2e2fc2a9bec7f4f73ffc2.tar.bz2 gentoo-4bfe16cf2b0a3f410ed2e2fc2a9bec7f4f73ffc2.zip | |
Merge updates from master
| -rw-r--r-- | dev-db/postgresql/postgresql-11.6.ebuild | 2 | ||||
| -rw-r--r-- | dev-db/postgresql/postgresql-12.1.ebuild | 2 | ||||
| -rw-r--r-- | eclass/elisp-common.eclass | 2 | ||||
| -rw-r--r-- | media-gfx/imv/metadata.xml | 1 | ||||
| -rw-r--r-- | sys-libs/libunwind/libunwind-1.2.1-r3.ebuild | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/dev-db/postgresql/postgresql-11.6.ebuild b/dev-db/postgresql/postgresql-11.6.ebuild index dc6c03ed0275..ccca92ebc7d8 100644 --- a/dev-db/postgresql/postgresql-11.6.ebuild +++ b/dev-db/postgresql/postgresql-11.6.ebuild @@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \ systemd user -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" SLOT=$(ver_cut 1) diff --git a/dev-db/postgresql/postgresql-12.1.ebuild b/dev-db/postgresql/postgresql-12.1.ebuild index 78ba8c159ba3..70a79def6121 100644 --- a/dev-db/postgresql/postgresql-12.1.ebuild +++ b/dev-db/postgresql/postgresql-12.1.ebuild @@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \ systemd user -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" SLOT=$(ver_cut 1) diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index a4bff25f165a..b5ea21cb22bf 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -457,7 +457,7 @@ elisp-site-regen() { # was actually no change. # A case is a remerge where we have doubled output. rm -f "${T}"/site-gentoo.el - eend + eend 0 einfo "... no changes." else mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml index edeb0befd84a..4d23e1202de0 100644 --- a/media-gfx/imv/metadata.xml +++ b/media-gfx/imv/metadata.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> <maintainer type='person'><email>jer@gentoo.org</email></maintainer> <use> <flag name='freeimage'>Use <pkg>media-libs/freeimage</pkg> as image library</flag> diff --git a/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild index d9557f28c39f..9defebe1a547 100644 --- a/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild +++ b/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz" LICENSE="MIT" SLOT="7" -KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux" IUSE="debug debug-frame doc libatomic lzma +static-libs" RESTRICT="test" # half of tests are broken (toolchain version dependent) |