diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-25 02:52:14 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-25 02:52:14 +0000 |
| commit | cee2e6987bfa00d2682e72d1d52bb7cde0251fba (patch) | |
| tree | dd1e1ed672d2cf5d4db7c0f6472e3e72a468de42 | |
| parent | 2021-02-25 02:22:21 UTC (diff) | |
| parent | sys-apps/systemd: amd64 stable (bug #770244) (diff) | |
| download | gentoo-cee2e6987bfa00d2682e72d1d52bb7cde0251fba.tar.gz gentoo-cee2e6987bfa00d2682e72d1d52bb7cde0251fba.tar.bz2 gentoo-cee2e6987bfa00d2682e72d1d52bb7cde0251fba.zip | |
Merge updates from master
| -rw-r--r-- | sys-apps/systemd/systemd-247.2-r4.ebuild | 2 | ||||
| -rw-r--r-- | x11-base/xorg-proto/Manifest | 3 | ||||
| -rw-r--r-- | x11-base/xorg-proto/xorg-proto-2021.3.ebuild (renamed from x11-base/xorg-proto/xorg-proto-2021.2.ebuild) | 9 |
3 files changed, 3 insertions, 11 deletions
diff --git a/sys-apps/systemd/systemd-247.2-r4.ebuild b/sys-apps/systemd/systemd-247.2-r4.ebuild index d2716534e6e8..f6da107853f7 100644 --- a/sys-apps/systemd/systemd-247.2-r4.ebuild +++ b/sys-apps/systemd/systemd-247.2-r4.ebuild @@ -16,7 +16,7 @@ else MY_P=${MY_PN}-${MY_PV} S=${WORKDIR}/${MY_P} SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86" fi PYTHON_COMPAT=( python3_{7..9} ) diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest index b204e149f776..538ac79ab77d 100644 --- a/x11-base/xorg-proto/Manifest +++ b/x11-base/xorg-proto/Manifest @@ -1,3 +1,2 @@ -DIST keysym-generator.py 15899 BLAKE2B c0d3fc72d1d12d21353ea9c4c397897784ebe10e917b03248badccc1ae35b59b405b6a2e682c800a8f1ae56a07819c03f2c5adfcc8e036d1237d0a697b6e3f0d SHA512 f51551720dee0e86b26f631f7ba7179b301a8b71c5a25cb8ec898eedbfb8a326533df9818103f7b1fabd2b5f1ecaeb72d5f2d4cedc46be8e954921246d210b9b DIST xorgproto-2020.1.tar.gz 1081369 BLAKE2B 1bed8d65499926a830180ee1fce5e5e57a276a6412231508eabb6c5eea5ee20dcce4046fc82203d5be88d1f24fb7919289393551d339e5cf5cb80b1c14f22c42 SHA512 d0bc3aec517fd00fa5fd32a5715760c34810a19154e10fb1f92f2e2fe7f26136f7ba9b76b47fcd37c3c4796663154f4e5abf6a18dd634619b0f718f3e4737ae9 -DIST xorgproto-2021.2.tar.gz 1125607 BLAKE2B ece6722de10779434395a26bb4f2421548af39ac96750d721320ed4a592c7119943b988c812cccdeb09c97b3ac51b78a5660ada5ba3489d0705777d1217818a5 SHA512 5e9728a08e934a01143bf5790fb098ab5358501a67786f0eeca875a25ee030d77b41c1481d5e501a6a82a205cfd62063ffb65344e83818b1e31a9133547e5fba +DIST xorgproto-2021.3.tar.gz 1130599 BLAKE2B 21aa84621984cd2635871c059ecbfe2c6290c74a3569f15cdce6080dd7e4106726ae9338112c075c8f64332ecb555a4ccb666bd7bf7e9bb1156b4591e5f37908 SHA512 0c2610551cc180b619611e0ad344e1a01cb0e5e83b3c8643cd6dbe19d8acc3a22e7c1522855923159dd753e4458c9f2d65b709bb045b27e17b83aa8c264e3d5a diff --git a/x11-base/xorg-proto/xorg-proto-2021.2.ebuild b/x11-base/xorg-proto/xorg-proto-2021.3.ebuild index 9aa9a84a71d7..2c391aa1de4d 100644 --- a/x11-base/xorg-proto/xorg-proto-2021.2.ebuild +++ b/x11-base/xorg-proto/xorg-proto-2021.3.ebuild @@ -21,8 +21,7 @@ if [[ ${PV} = 9999* ]]; then SRC_URI="" else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz - https://cgit.freedesktop.org/xorg/proto/xorgproto/plain/scripts/keysym-generator.py?id=7b6836f0d5ba44d94abb7b3163ef715d023b270c -> keysym-generator.py" + SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" fi @@ -47,9 +46,3 @@ python_check_deps() { pkg_setup() { use test && python-any-r1_pkg_setup } - -src_unpack() { - default - mkdir "${S}"/scripts - mv "${DISTDIR}"/keysym-generator.py "${S}/scripts" -} |