diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
| commit | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch) | |
| tree | 25413d1cb3a0cbfe36029db32398c0f333609215 /dev-util/imediff2 | |
| parent | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff) | |
gentoo resync : 14.12.2020
Diffstat (limited to 'dev-util/imediff2')
| -rw-r--r-- | dev-util/imediff2/Manifest | 5 | ||||
| -rw-r--r-- | dev-util/imediff2/imediff2-1.1.2-r5.ebuild | 39 | ||||
| -rw-r--r-- | dev-util/imediff2/imediff2-1.1.2-r6.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/imediff2/metadata.xml | 1 |
4 files changed, 4 insertions, 43 deletions
diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest index 8e1ab134f586..098569ebb561 100644 --- a/dev-util/imediff2/Manifest +++ b/dev-util/imediff2/Manifest @@ -1,5 +1,4 @@ AUX 1.1.2-python-3.patch 4553 BLAKE2B bc16393f3c7071017255e8f188456e77d89a2ab2d605d6d99882aef4c65c7e5270a9348cf278a98d5ff7527423e899feffbb93b00f12a8c6e9a7b131acb86eba SHA512 fa5065572eb7fdbf38e3d7785ae92bddaeae8eadd9dbd006f5691c8647087df7529015750b66ea7618dd3306fcda80083c8dc2d2f019787137095db5b2c1a4d7 DIST imediff2_1.1.2.orig.tar.gz 17974 BLAKE2B f83b6ab652b1dd044587e75e4e7551a8132e1860b14f0d85d37f35383bd161a672860162e93554cf4db844d6a4700fa1876a30874c50fcb8442b4190a9b19185 SHA512 54d196d67107283bc3339eba30acb1c60972f256a268e86da397e0bdafa05220facc7979638a6a917b0c2dc7171edc3aa6b188295c9f40e9debf87a63731e748 -EBUILD imediff2-1.1.2-r5.ebuild 781 BLAKE2B b9ead2e81dc7ae8c220c7f8bd49e9ba4db66c72fbf2c2f9c59ece8c757ede11e7b1bb72f6e089c05d793b1497cd98ef00cb7b2776f7f4d72e75ae583c831602b SHA512 5ab6deb4fdb12cc8746ed7b6f42e0fcd651761d2aa3ec0bd91da7f3df3ff57aa76e2162d9349172822df0d8089c787ec6a8101bedc582f0b7f3e2ef4c706b697 -EBUILD imediff2-1.1.2-r6.ebuild 775 BLAKE2B edac497a5df99d7795bdee94bf8dc0bad18bf5b52bf7e25315a800f2380a37483bc65b2c750d95d9db4b9fd76754fa99f1e8466c69570d94782c17021bbc6163 SHA512 70e1aa2fa11ff2530c5d5204a568bdc85ed51232bad940deb80ad8f796c728083ebf5eace768e96ff369fb404cd2e6e36074351c047b5569612f6ba82cd4fdf5 -MISC metadata.xml 246 BLAKE2B 464fa3d4dae2c15dd040a7580e6324ebe6cd2fa1d37a746ce991ec34484621fe6d3ae2362ea7696bde10cd6c466e1c8e0fd1fdcc161de4a502970e9e2841faa4 SHA512 30ecd86dc0fd1e0c83b4401da36f040346046e260e53c9ce77336869a2442d6b432863b031f61aa2209e58e43d172ef471c6fae5ef19a4c9e2a653e60e96c73a +EBUILD imediff2-1.1.2-r6.ebuild 773 BLAKE2B 5828e2b2f63f03f6e2771d46d61d153f31beca1cbc266e5ccec7f9e6accd043984eacb8fdc58ae22f47261ab574db6ca8d4687f99a10ccefb58fc0116d4d1c74 SHA512 90cc81e4719b4c02a9838bcc1cf44e1bbf4ac9d9244620335a809580e5be84561b721889fbf9097283495ee6b482977c8c25321f5e935fea1829591088659da0 +MISC metadata.xml 270 BLAKE2B db96fa7275398e582ba29ef0506116343ffb732fb9f4885311a7ebb5db977382dddc2e9d05c57f53f87e2961dd8bf768336f7c7b8bb5e80ece44969bb1c7dbee SHA512 650922039b23e4a7727a2a4123577d872000f6fbcd303b45801ad9e00dbed3326aab1d69964d18c1f36779b91011016a8009157d04757f4a9fe777e6b01734b8 diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild deleted file mode 100644 index 367b5313edfb..000000000000 --- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7} ) -PYTHON_REQ_USE="ncurses" - -inherit python-single-r1 eapi7-ver - -MY_P="${PN}_$(ver_rs 3 -)" - -DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode" -HOMEPAGE="https://elonen.iki.fi/code/imediff/" -SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND}" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -S="${WORKDIR}/${PN}" - -PATCHES=( "${FILESDIR}/${PV}-python-3.patch" ) - -src_compile() { - # Otherwise the docs get regenerated :) - : -} - -src_install() { - python_doscript imediff2 - dodoc AUTHORS README - doman imediff2.1 -} diff --git a/dev-util/imediff2/imediff2-1.1.2-r6.ebuild b/dev-util/imediff2/imediff2-1.1.2-r6.ebuild index 53ef872d4340..a210685fab7e 100644 --- a/dev-util/imediff2/imediff2-1.1.2-r6.ebuild +++ b/dev-util/imediff2/imediff2-1.1.2-r6.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" IUSE="" DEPEND="${PYTHON_DEPS}" diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml index 7782eaa2297f..dc74e8075c11 100644 --- a/dev-util/imediff2/metadata.xml +++ b/dev-util/imediff2/metadata.xml @@ -5,4 +5,5 @@ <email>grknight@gentoo.org</email> <name>Brian Evans</name> </maintainer> + <stabilize-allarches/> </pkgmetadata> |