diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
| commit | 38423c67c8a23f6a1bc42038193182e2da3116eb (patch) | |
| tree | 04e2cf4bd43601b77daa79fe654e409187093c5e /dev-util/meld | |
| parent | 623ee73d661e5ed8475cb264511f683407d87365 (diff) | |
gentoo resync : 25.04.2020
Diffstat (limited to 'dev-util/meld')
| -rw-r--r-- | dev-util/meld/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/meld/meld-3.20.1-r1.ebuild | 38 | ||||
| -rw-r--r-- | dev-util/meld/meld-3.20.2-r1.ebuild (renamed from dev-util/meld/meld-3.20.2.ebuild) | 9 |
3 files changed, 9 insertions, 42 deletions
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest index 2e472878c9ac..665a0a33ea27 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -1,5 +1,3 @@ -DIST meld-3.20.1.tar.xz 594812 BLAKE2B a06ae48af37008b99e7110a826e1d97326b71150870c1546b50d971f51d6c9eb3b24fd8e5ae8e8e8daf30f0a83c71356a368d9ed49114989cd22fb793a644a78 SHA512 cd21f298dc1da6eb08261599b9270989c837e0923d5cf5cfdad227dd7f256ac5f53ac903939ebef90ea6cd684c7355ce9482648057284f4ce44f1c7101959c1f DIST meld-3.20.2.tar.xz 593948 BLAKE2B 9f2fee48405d76f9ae2fd0b0dd4116321aa176059dd4ef217a5c4c8d0edff5859bab72bbca83b2e7d612706f017d1889d68579eaf9838d7784c9ecb74ed7d403 SHA512 9c9074cb879e3574eb9a1025eb1212771419ab0d8e92bf8a99f38e70ca583ff5c8cbeaccb87b414e6ff73a61afa08e10742991d574b810cc90e8c4a5ac82ddaa -EBUILD meld-3.20.1-r1.ebuild 931 BLAKE2B f0d83fb33c7a2fca0bcea034fe25ca8439cdfca097fdd3ae571f416e65d45b59042132bbc3e1a9fc65255d5fde225678c329c4eb8d8e562fe54a9ec2de100afd SHA512 62b485acadc0572a74c89802e3818acac8e8eb4e3ea2cbb1b0baffadf64cfcf433defec7cf1d08859984b80eb815ef5c004d20bd301c4fa4ff01be6a504459bb -EBUILD meld-3.20.2.ebuild 1174 BLAKE2B ca1a4320c9bc3c756ba78e29ad42cfc01bf7ea8a105ab3124ceb708dcc43c10efc3fa5188e28e99e94ba2fc7dc884d3a71ecf6695c880108185ef3448fcef3d0 SHA512 6b111715692fdd3eb2b17bc310c853c4eb3a668ef4f310fa4f0b57d77bd19c8880267edd267c79d3d4641ee691bbadd17596c04703bec262f3ea1521735cf546 +EBUILD meld-3.20.2-r1.ebuild 1406 BLAKE2B 13584822203873664df1a2b03fd6766349edff3892cbf33184c460dc0038039a35ed06f02b300334c55d5b50c91f21008a07a86e091b4f2c5d9ba5e328cea4bb SHA512 a9d3bc2ff9b5bc006d5e15ecfd69a5b00063a26984cd1d9945dddeaa2bf7784da1083a65b46155d65d633321be7699671a6f210ea1a1f28b306326668ce8500f MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-util/meld/meld-3.20.1-r1.ebuild b/dev-util/meld/meld-3.20.1-r1.ebuild deleted file mode 100644 index 7891198a1d56..000000000000 --- a/dev-util/meld/meld-3.20.1-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_REQ_USE="xml" -PYTHON_COMPAT=( python3_{6,7} ) -DISTUTILS_SINGLE_IMPL=1 - -inherit gnome2 distutils-r1 - -DESCRIPTION="A graphical diff and merge tool" -HOMEPAGE="http://meldmerge.org/" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="${PYTHON_DEPS} - >=dev-libs/glib-2.50:2[dbus] - $(python_gen_cond_dep ' - >=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}] - ') - gnome-base/gsettings-desktop-schemas - >=x11-libs/gtk+-3.20:3[introspection] - >=x11-libs/gtksourceview-3.20.0:3.0[introspection] - >=x11-libs/pango-1.34[introspection] - x11-themes/hicolor-icon-theme -" -DEPEND="${RDEPEND} - dev-util/intltool - dev-util/itstool - sys-devel/gettext -" - -python_compile_all() { - mydistutilsargs=( --no-update-icon-cache --no-compile-schemas ) -} diff --git a/dev-util/meld/meld-3.20.2.ebuild b/dev-util/meld/meld-3.20.2-r1.ebuild index 8c64e7939216..cd83e457a06a 100644 --- a/dev-util/meld/meld-3.20.2.ebuild +++ b/dev-util/meld/meld-3.20.2-r1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://meldmerge.org/" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="${PYTHON_DEPS} @@ -40,3 +40,10 @@ DEPEND="${RDEPEND} python_compile_all() { mydistutilsargs=( --no-update-icon-cache --no-compile-schemas ) } + +python_install() { + local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas build ) + distutils-r1_python_install + rm "${ED}"/usr/share/doc/meld-${PV}/{COPYING,NEWS} || die + rmdir "${ED}"/usr/share/doc/meld-${PV} || die +} |