From 70b82ae359a5538711e103b0e8dfb92654296644 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Oct 2018 12:48:57 +0100 Subject: gentoo resync : 27.10.2018 --- dev-vcs/Manifest.gz | Bin 13631 -> 13625 bytes dev-vcs/gitg/Manifest | 2 + dev-vcs/gitg/gitg-3.30.1.ebuild | 92 +++++++++++++++++++++++++++++ dev-vcs/hg-git/Manifest | 5 +- dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild | 29 --------- dev-vcs/hg-git/hg-git-0.8.10.ebuild | 24 -------- dev-vcs/hg-git/hg-git-0.8.12.ebuild | 24 ++++++++ dev-vcs/mercurial/Manifest | 2 +- dev-vcs/mercurial/mercurial-4.7.2.ebuild | 3 +- dev-vcs/stgit/Manifest | 2 +- dev-vcs/stgit/stgit-0.18.ebuild | 4 +- dev-vcs/tortoisehg/Manifest | 4 +- dev-vcs/tortoisehg/tortoisehg-4.7.2.ebuild | 79 +++++++++++++++++++++++++ dev-vcs/tortoisehg/tortoisehg-4.7.ebuild | 79 ------------------------- 14 files changed, 207 insertions(+), 142 deletions(-) create mode 100644 dev-vcs/gitg/gitg-3.30.1.ebuild delete mode 100644 dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild delete mode 100644 dev-vcs/hg-git/hg-git-0.8.10.ebuild create mode 100644 dev-vcs/hg-git/hg-git-0.8.12.ebuild create mode 100644 dev-vcs/tortoisehg/tortoisehg-4.7.2.ebuild delete mode 100644 dev-vcs/tortoisehg/tortoisehg-4.7.ebuild (limited to 'dev-vcs') diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz index da33438bf049..fb507cca9791 100644 Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest index ba9d608cc05d..e379859bcc45 100644 --- a/dev-vcs/gitg/Manifest +++ b/dev-vcs/gitg/Manifest @@ -1,3 +1,5 @@ DIST gitg-3.26.0.tar.xz 1551308 BLAKE2B 45a9fd3df8eb891c4e07eefb6cf8f9b517c78dccc63dd08498b4c847614e164472e0605a01c81515ea349366e56c21c99a4558e73b6548b18bb94f578c0fc9bd SHA512 782aa02e2f0f4d8c86ad726045502d545877d835f0449d2ec646d93a78bbfa50f84662d3a437c922eb168b2737c00ec088dc2c73487742f332e3910f041b519d +DIST gitg-3.30.1.tar.xz 10555888 BLAKE2B 02e8f957eee82bbf0702ca39b5b336929c131a93a94f5e28a2e4aa7c2c473c5d8bda072eba184cef37d6ad2fa7bfa21c007c86204a0a81b6d401487d752952fd SHA512 0d9241422dda6bf1840632fbcabf6b640554081ba995eba59ce90f893654e42c0ca8953e814533b90f362abb13b002e7a74b5f6841aee1f33c2834d2acab869f EBUILD gitg-3.26.0.ebuild 1927 BLAKE2B 97bb1f4da59bcf28643516ca55e054fe6405765dee0ef2bd70cedf6fc29ec2d422767d4dce420afe5900e5759e4f1b82d0b88b971e4ca59cfee9cbfe1e7b53f2 SHA512 fd96b0f937e1beaba697bd5449f6cf916809d4e121594acf405cdb98a156dae4f640ac2972f768cfb213649455948f3d008218fe7a7e0c052686be43185db217 +EBUILD gitg-3.30.1.ebuild 2033 BLAKE2B 5d1285ef530a9d5323a30a3e482fdd2ba8190f6b5bc203039c2b5af6b3ee777b4930dfc9a53332bb9285693c9c67d691223faf3208059dc03db84092d28387f1 SHA512 572096ce835b9134a3c5779e796dc3aab9aa4888c786c5faf6ff5102c9e169ceef7d5916597a53c14b5ffc6c77c1f3ae64b5ee14153eb2a54fb4133b69738c37 MISC metadata.xml 927 BLAKE2B f967c30f2442bbbef782e69c044900db8bd733c5463b2aeff35496225be549827e8e8f9b7d072ae9396500cdcaecc9f7b4902524b5a3768848736d0bab8adc35 SHA512 889733c311b2ab0e35aadc3fff1bcb50c3dad59186293e2f46e81ba4a0041137938e38f12bcfa40d793a04462bbce25aa476bc9241fb5c7a5c4a25611e371d30 diff --git a/dev-vcs/gitg/gitg-3.30.1.ebuild b/dev-vcs/gitg/gitg-3.30.1.ebuild new file mode 100644 index 000000000000..8b455c5215f3 --- /dev/null +++ b/dev-vcs/gitg/gitg-3.30.1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{4,5,6,7} ) +VALA_MIN_API_VERSION="0.32" # Needed when gtk+-3.20 is found + +inherit gnome.org gnome2-utils meson python-r1 vala xdg-utils + +DESCRIPTION="git repository viewer for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Gitg" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="glade +python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +# test if unbundling of libgd is possible +# Currently it seems not to be (unstable API/ABI) +RDEPEND=" + app-crypt/libsecret[vala] + >=app-text/gtkspell-3.0.3:3[vala] + >=dev-libs/glib-2.38:2[dbus] + >=dev-libs/gobject-introspection-0.10.1:= + dev-libs/libgee:0.8[introspection] + dev-libs/libgit2:=[threads] + + >=dev-libs/libgit2-glib-0.26.4[ssh] + =dev-libs/libpeas-1.5.0[gtk] + >=dev-libs/libxml2-2.9.0:2 + >=gnome-base/gsettings-desktop-schemas-0.1.1 + net-libs/libsoup:2.4 + >=x11-libs/gtk+-3.20.0:3 + >=x11-libs/gtksourceview-3.10:3.0 + x11-themes/adwaita-icon-theme + glade? ( >=dev-util/glade-3.2:3.10 ) + python? ( + ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] + ) +" +DEPEND="${RDEPEND} + $(vala_depend) + >=dev-libs/libgit2-glib-0.24.4[vala] + >=dev-util/intltool-0.40 + gnome-base/gnome-common + >=sys-devel/gettext-0.17 + virtual/pkgconfig +" + +pkg_setup() { + use python && [[ ${MERGE_TYPE} != binary ]] && python_setup +} + +src_prepare() { + default + vala_src_prepare +} + +src_configure() { + local emesonargs=( + -Dglade_catalog=$(usex glade true false) + # we install the module manually anyway + -Dpython=false + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + if use python ; then + python_moduleinto gi.overrides + python_foreach_impl python_domodule libgitg-ext/GitgExt.py + fi +} + +pkg_postinst() { + gnome2_icon_cache_update + gnome2_schemas_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + gnome2_schemas_update + xdg_desktop_database_update +} diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest index b45d9b76bd78..aa1af8360bb8 100644 --- a/dev-vcs/hg-git/Manifest +++ b/dev-vcs/hg-git/Manifest @@ -1,10 +1,9 @@ AUX hg-git-0.8.10-hg45-memctx.patch 1817 BLAKE2B 73e638b88698950e3f178c30c063ea269717738923c4f81a25795eb3ac90b14b5477a08c185a37931a174d18855709cf55089819e5c73859c8af7323959adc6f SHA512 63b24d3a5cf0f553521184049b9c8452e1d66af9a89bb20960ca5198c58af53b0e106dead0cbe2b61f1b6a786ef33547eb9215483eafb57191dd1c053ec124be AUX hg-git-0.8.10-hg45-memfilectx.patch 2586 BLAKE2B c40212ab0d201993d2f97b425e84e0f09cabe94e804078c680dd3084859e65d3beb4a570d717f57c1eb2bfeda10d3fdc1440d3d12fcf816d05cf2ea033bb8969 SHA512 3211680a1ebcd508f7a4794ac796bd25fda22087a98f51b7d06e8b9ba16314db061ac8a0085dd0ccecf834c316f27bca54acd87c2152b3bb72df7d6580d5dff9 -DIST hg-git-0.8.10.tar.gz 116019 BLAKE2B 425a066864051f03e3a3305e74a5920055a7f4c79826711c567a59fcb32171db3ca732ba3bb61edac4ac9847fff897cca4fe0d02e65f69e7b0f0440fa2f32cf4 SHA512 ea6de91114005d38568eae1fa5f38aafe73c472c480496ea05b4472c1d8fbc89e76c9bb34eef2641b89e6d0c3f2a9a187d844687214f5599d0b4d0f6b7928c32 DIST hg-git-0.8.11.tar.gz 118537 BLAKE2B 05a63633f8909260428197334812d314cdba115324fa7dd70ccb5d0ee1e21089be0b8bb0cb1cf09f5f738cbee00e3e688646daa3debed9fa36fac2ff62bfcb8b SHA512 ced6b8b522f75b0e2b59c5113b3afd7b02eb2e3798a7aecdc211a15aba1363d3785234e909644626b5c16d7e8b158a6fe1f1120dcd85b5709d8a84ff1f4b6655 +DIST hg-git-0.8.12.tar.gz 124456 BLAKE2B 31a899ba1f2e0de861d81e7ff5fac9f82e9c08813b77fa8a4da3aeae590d7e8cb6c37abb80ebe34a80835c210f10145df7429685cb71ffab7bfe8d5a628d3d12 SHA512 77af45c8f35febe354382ee043be7f0f2c53e1ac7ae331a7068a0e117ed0f54adaa7c7f5127e247e089c9204b9130dde286aa887997b7ab7ede48f447797608e DIST hg-git-0.8.8.tar.gz 98508 BLAKE2B e7636c3809b2be8a7fcce44a72f89f39927a282c34384047036470fc832b34be1922de75a2a9b468ec125ea716263333f5f58e6a0c7de12729b7dd18c68b657a SHA512 c3b28273024f2429ed526354048f0e37d0af6be591020fa3b1e8d1321247d72129f7c8fbcef73e69d60e243a6f86380dc4d89f0e8f913b786ef4497421237aac -EBUILD hg-git-0.8.10-r1.ebuild 800 BLAKE2B c8cdbe02f8d1b72922d1143a3cbd7f8f971d13de62f2841c59e52cac107ec5ff25d977ae29fc27444783bed30db955f88ebda714bf3df3f0ea43071cd13afa31 SHA512 848a5b4cc539da8fb4e578a11602e279f562211bcde22d5e7a0b8fe49e0f8fe01d4d560b90bfd17d7a502f5ad80cd664fad0ada8d02b60f42c60d7fcd648f9b6 -EBUILD hg-git-0.8.10.ebuild 707 BLAKE2B d0013bc65ff7b9470d40728d9fc4393fc552cbefa710ca340ff894069e0e2af56415313eb632f117a85674bfa68e57d401f0dc28eb85fdb1ccaa700773b9c9ab SHA512 11e15d0520c9371175706bb633e71101f179072270987a952628d7fe6b11294d67501b9e934e7fbf61270794ce57ce81941e5109e42b41c88f8ee04995bc9fe9 EBUILD hg-git-0.8.11.ebuild 707 BLAKE2B 6bf0f75ecf2877a5b3d4775949aea77332dbb57d874c21acf36c10c0a377e543f6087e882a34127c56b92931ab47456f36a10019091c247cd81e0e84c4fa0b71 SHA512 b404e426bbfe1cefe5d56db9ef463ca4833c1e40dd7ec5ef9c4fd2eb249301fafcc8e321417557058307b8992420a56244245e1a908485c30977b30428849123 +EBUILD hg-git-0.8.12.ebuild 704 BLAKE2B 67f021ab754992b636235ffd2ad7dd43dca05ea63096764f4e63e77ea683b6a6ab057b6581300fb38f95d2dab3a7425a7694b9ea2e24146f38be240400303de8 SHA512 a23762cace05828e78628187a6fd4c34acb6d2a9b9ae9889005d209560fe36af792b8d81eda6e831a97b509c22378e966aaec7153408cf1d07234bdbaed5cac9 EBUILD hg-git-0.8.8.ebuild 697 BLAKE2B de1b6b49eeef84667cad1bbe50a10ef919352b49e402f9d0a48c7ff2c6f560dbd5e208d5456a38c07473bc8dbab1f23eef8cc85a8d90d333a4b98f30715601a8 SHA512 b0f24d48a56171a5c30575df57db48ac859bedd5912a48194a9183c06930e5e56b01a06e5dbcee7462d692f1c9a41f79fb593a73cdd0ebf418da05b24bee9cf2 MISC metadata.xml 317 BLAKE2B 53e7e3877f6f42a888ad50ba824e4a50f4535d4a9345ff2a661ae3df79e57bddfb8faa80ea632856a530b99518e90d4311f8090003880f3a5cf073fec1d8c926 SHA512 98a36b756fe1f1ee4f2d7c1f7f0dee8925a1396d2b44eff84274aa4c6e871d87d17808e157c6020cbeeec763e44fc4ba6e5d266561b3fe5c015f04c864349a09 diff --git a/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild b/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild deleted file mode 100644 index d35e34623578..000000000000 --- a/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="push to and pull from a Git repository using Mercurial" -HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND=" - >=dev-vcs/mercurial-2.8.2[${PYTHON_USEDEP}] - >=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] -" - -PATCHES=( - "${FILESDIR}"/${P}-hg45-memctx.patch - "${FILESDIR}"/${P}-hg45-memfilectx.patch -) diff --git a/dev-vcs/hg-git/hg-git-0.8.10.ebuild b/dev-vcs/hg-git/hg-git-0.8.10.ebuild deleted file mode 100644 index acf6cae2bdae..000000000000 --- a/dev-vcs/hg-git/hg-git-0.8.10.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="push to and pull from a Git repository using Mercurial" -HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND=" - >=dev-vcs/mercurial-2.8.2[${PYTHON_USEDEP}] - >=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] -" diff --git a/dev-vcs/hg-git/hg-git-0.8.12.ebuild b/dev-vcs/hg-git/hg-git-0.8.12.ebuild new file mode 100644 index 000000000000..241771d68ef9 --- /dev/null +++ b/dev-vcs/hg-git/hg-git-0.8.12.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 + +DESCRIPTION="push to and pull from a Git repository using Mercurial" +HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND=" + >=dev-vcs/mercurial-2.8.2[${PYTHON_USEDEP}] + >=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] +" diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index 79490384c8ff..72600c408c12 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -9,6 +9,6 @@ EBUILD mercurial-4.5.2.ebuild 3536 BLAKE2B 6ad1f105178987b408397b9593ac8c9804353 EBUILD mercurial-4.6.2.ebuild 3537 BLAKE2B 7f4c2e4c579ab768dd629d53b2fdf1062980405242376c727b05a8a474d6bc8afb4db0f82e22252dde24b6909f9ab87d8650ed73600e6dc01ae4ef2fdcfc71cd SHA512 1549175116f2496ae8bac35360b142c9ae95d458b764496648eeb9165fd79fd030bfcb0386df61a568a7d8536f8e846a9b127f22fe2937ccac5982135e89cf14 EBUILD mercurial-4.7.1-r1.ebuild 3645 BLAKE2B 0a89f10a7205aaedd01be6efc216f7b6e3a9da54d02ff1d32a9f3b7bdfd2eb1491a854c2ac7447f43da71a8d045aaf48f811ac28458208c85a57d8834b72a55f SHA512 06d522f750227739d3f283a3805c92da5f42709cb289a543cdb319e6f386b990439086925015a7ab14b02dfe4e55914446b42de4c89f53e124693cfc2fcb8e91 EBUILD mercurial-4.7.1.ebuild 3493 BLAKE2B 9145b0af45da7e9ec4f78e470928a77f0a6aa553283873e406a07940221d386aa95b4b43c0c1a79930d447fd215bcdf8422494e1e6e4f94bce8399d363050011 SHA512 00baba63605300fa052f578186a2e061d98058b59d75b2ed5394af398c8afa86209f450612ea3d39bc3da17111dffea5bd6bb02ddcd21d47f32dc0ec86f937a2 -EBUILD mercurial-4.7.2.ebuild 3719 BLAKE2B 5b0a9f14f75a10b412beab259e34687c88681879b37644bae27c3b5ebab0d85cbaddf3e2da2606a35c52a8b426fc8efba829af6a6feda77b9dae7f6c5011ab7d SHA512 59d23040a87f893a62d35b379d286a6d8d8f0a8262f91842e4a46d165ac6ae9a9bf9f27b8c5e7b817292962e4d92c87b0fb6b22f1ee1a483f23a750f43b0248a +EBUILD mercurial-4.7.2.ebuild 3758 BLAKE2B 7ba054412e16e6b2966a4152e8821e01f5541d49f4a8f31455bfa4e0cf45ab3f329cfc64e5d0a75f8bca86237bc692033e9f350575d3840fd75f8f8a301822cc SHA512 809dee48bb4d6f2bc1ce7925eb31d6709f15df740f13070872b23ec71e9a85f39d8aedb254c09cbca63e206b6ff38244109c82e390484a873f0d201ed6224ef2 EBUILD mercurial-9999.ebuild 4131 BLAKE2B 55328bbb7ccca04843b595d18c44dbbf5a51e4808a4e9d517355c38f89270551017fdeca45471972210e7246aa970dfa4ae4f5951cd4ff5d33e9ae696ef45b41 SHA512 0f6ee4a02c89c9e08e0a18e1f11169836eb336cf18af01df22d0a8b189c8fa61f0de5fd0b28105f83df55b23f840ad4ea934fac779c64ba5156c042106169c08 MISC metadata.xml 456 BLAKE2B d824c2b22d9785c268cfadaa4456794cf423ef6df69767577c4df16e6cebe3bc3c02f40ec7dd799eaaf6bac5754bee28b6b923b11d40f628fcb4a4f85a849de9 SHA512 2bf62b3a98e71ff5acba09c06cc1f29a2cb24d6634a384ff800bb10ab6f5de71a5db440b0fa8a5183db95eafc6ad98444a817c23887baf0dc59f6260402574b1 diff --git a/dev-vcs/mercurial/mercurial-4.7.2.ebuild b/dev-vcs/mercurial/mercurial-4.7.2.ebuild index 2b7e1bbf0e22..60e5ed59b655 100644 --- a/dev-vcs/mercurial/mercurial-4.7.2.ebuild +++ b/dev-vcs/mercurial/mercurial-4.7.2.ebuild @@ -93,7 +93,8 @@ python_install_all() { doins "${FILESDIR}/cacerts.rc" # symlink to system zstd - dosym ../zstd.so $(python_get_sitedir)/${PN}/zstd.so + local sitedir=$(python_get_sitedir) + dosym ../zstd.so "${sitedir#${EPREFIX}}"/${PN}/zstd.so } src_test() { diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest index 34c5caafebe1..0dfd8b2acc67 100644 --- a/dev-vcs/stgit/Manifest +++ b/dev-vcs/stgit/Manifest @@ -4,5 +4,5 @@ DIST stgit-0.16-missing-patches.tar.gz 1667 BLAKE2B 3aa26305b948c49bde0aec71e969 DIST stgit-0.16.tar.gz 362687 BLAKE2B 4d6579d39d8a22929d70268ae07bf7c5ac17eae21c615aac0ae8e9adb146aa87a3f7d1b057fd7269175c363ef5057f4ce24f6ef1087f54dfb1165f2800a813cf SHA512 782de3d5855aad4f5d040478745990517ebe2b26dc315a3ed41db95399bb46e075d63a70baa0e3aa2ab1012b59e6ad1f5940a904f296ef09d6bca60f66e417dd DIST stgit-0.18.tar.gz 235852 BLAKE2B ff35856c1f20a6a611a2faa22ba573b1c33636c9e913322456011c4c5a73c3207ddbd8bfe41cb81b11dffe8db8b89594c1598989ae9fb896cd686594a21d96b2 SHA512 5820cc1a8cdd5183fbe309b4b80568098844ff57934c75a43263b5cfcdac4b64e015abc9ed6a53dd856236d76bd0ebeec31e87561bca0d0d82a6e5ec7a10745f EBUILD stgit-0.16-r2.ebuild 1732 BLAKE2B 2be40c1d991060b15413ae0c718b7b8793c1f8458fa0c52fc45e2e62568566975ac2c15c12b1f8065b475d9753f39dd92ae8095ee8c971c638d008da64ab82d3 SHA512 015a83ab10571d9000f0394c2173a56feac071ca6680ec9b4ee6b6e7c4be3a6e098a231be71bac87ddec9dfc415808f0a86dd30c4bb142493358d8558810cc0a -EBUILD stgit-0.18.ebuild 1892 BLAKE2B e1465b92146958a500666e23ce4925c867759afab76a1dfe32cf7ab087650a71eb00326ff9d5306ba92a2ba5c0b5e46a963470cab74035651aebbe373851ee14 SHA512 9c2ca4be361b2b0b78711a48b069d00ec2ea52e9197303d7f3763724ce07201d2ca5bff6bcde793bddae7f3c5ec66f80e06d0bf73360133d51e91de985cdd397 +EBUILD stgit-0.18.ebuild 1883 BLAKE2B 1ccceee2fb9c6b039ac956ef85444fdca246aacb75ff5a55c6351faf909a09d6148b173eba6cd7c0b0b5f54271050b83cd059979619036b9eb703c8c8b2de837 SHA512 2557043aa518718bc489ac2004a69f155a913c9bc38520cfec8c22daf2629a76d14baf6bd4cf8fc4ade0c2ee0c35974f5f33c5bc715aee1119791d26dbe7224e MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8 diff --git a/dev-vcs/stgit/stgit-0.18.ebuild b/dev-vcs/stgit/stgit-0.18.ebuild index e56d0dbace52..11e95e4ec16f 100644 --- a/dev-vcs/stgit/stgit-0.18.ebuild +++ b/dev-vcs/stgit/stgit-0.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -52,7 +52,7 @@ python_prepare_all() { # this will be a noop, as we are working with a tarball, # but throws git errors --> just get rid of it - sed -i -e 's/version\.write_builtin_version()//' setup.py || die + echo "version=\"${PV}\"" > "${S}"/stgit/builtin_version.py distutils-r1_python_prepare_all } diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest index fc8da084f260..07f0719517e2 100644 --- a/dev-vcs/tortoisehg/Manifest +++ b/dev-vcs/tortoisehg/Manifest @@ -2,11 +2,11 @@ DIST tortoisehg-4.5.2.tar.gz 7935559 BLAKE2B c69107f28767936232937ee0b730b9b937d DIST tortoisehg-4.5.3.tar.gz 7929645 BLAKE2B 95b867f372d636ed84eda918a707e24f4b11e34679ae9ed1c25f82a7aa6bb77f424bd68a99b5f961d14960a2f33005536996de2f3df9871684bb53f68130b1b2 SHA512 0c6c512f7a46a084904a5e66912deb8ef4abb99a6a97c46b6b058537332f091395f4b9b8a4b645d7c42637abbb4e8abe16f5040fd694bb43ea8b4c6ddb1e18f6 DIST tortoisehg-4.6.1.tar.gz 7947844 BLAKE2B 68d0e8672febb9bfdca763e77cbaff8de79c2de79b61e0096c3ef7370cf9d9287a5fd65fbe3c262e13f185bcf5e384ece5d8365979bc05188e74ccfb49f43543 SHA512 adf5ebfc7a76843b62f66feddfde42c0f915c970a951e037f082ee4a6b393822b023f116dc650d5242838d006dc572235a4089c3805929727435588c24ded480 DIST tortoisehg-4.7.1.tar.gz 7948085 BLAKE2B 7f92ef6fc68b7535905c0b4e172a00eb94ac720fc35175d47fedcf78783fa7c1430562af3ad2dbe43a894233acd5a8160c2a730b9281af1bbe4d3d1ed4513f3d SHA512 f163efb886001288156276ccec97e3759eeb699a2b24f5579bd47809a262881fb585f846157f35a72c35e5b5ef0a42ef899b20d21b7b75b6e92cfdf34e993418 -DIST tortoisehg-4.7.tar.gz 7947751 BLAKE2B 8e50ec04e754aae65bf8fd9754ad78070d3fcabadb2af447f9af2c8ca954cf17c635ab4370aa501be24c1c6714c75bf1b5f0f8031f620ca3d4e3dc6098ccea10 SHA512 3c842741275dc08a7f9261fd9989575cb3036d23bb4e1c454ce98ffc721e913286d8f15d10490d108f18df1981295c42e4ada663660844de3ec6976cf77378a3 +DIST tortoisehg-4.7.2.tar.gz 7948303 BLAKE2B 9439b86cfd004aa78fc39941cee005b3fe7fcf3a7a5d5dab4c0e0ac12477338000f07105fd7ee6c67def731f406313280acb6af7d5f1d70c51331d7339b21038 SHA512 d4d3c2bb097d12f69594d25c0029bf347f6aee7e4eb3fdecf3d49f3c679b11112376410a87733bb5e29ffdef2c6837e47f7af18121cb5b14ccef22f27a55ebfe EBUILD tortoisehg-4.5.2.ebuild 1954 BLAKE2B 39ba4dcab7e5adc52259be8fde3759374be41a5b222933f12c1fba2214e47827187164fe63342a59767e75d37ccb888deb45c329943698bedb52a39f813c24eb SHA512 cd6906236863be316c45f0208ef174cdaf03a7075d148bf1cb573fc4620f051a81ba764c8852109ed2365da15c8395947d0622feffd0d6831069df0c4634e6bb EBUILD tortoisehg-4.5.3.ebuild 1956 BLAKE2B 455f8582101c7862cecdba7d683a0fd4eb27c595435ca66819104d94763456c6c8dd4c68f941d9d40b9bc14ff1b73a6c986e4ecdc290d93cd2701b6e53721ae3 SHA512 530d586ce4e1157b10de3a08be0498191827510626e975448ba5dd6e084d5263b14f228043896fab0d87a107ff6f97aa9cfd78b7fe2a505f3f696251d68a56de EBUILD tortoisehg-4.6.1.ebuild 1956 BLAKE2B d50b774f17318c1cf54b28ad6e4af8df223505ca784679f9ddef11c8a22a1b814f38ee285c6f825745c0076f37bfa3c5104c4b36cb6e138822880418d8a93c52 SHA512 6b6e0868b76709c25461777c13af1c65c14ac6e843aadca60246bf831366395a2b0169caac279a8d7ea48120101550ad3647640759be8d97b89955cb8b72b737 EBUILD tortoisehg-4.7.1.ebuild 1957 BLAKE2B 74aa1ae2c1d97ed38f36d08f18d4d8bf471671f3fa6a8381f8adefb6b4e4b16880e1668d0bc977ba008798ff0c3a6770adc73839558ace259cfa91eb63408ea0 SHA512 b4d7e408fe83b292b07d87d0fcbb342a5c2a0e59dce0de8d319bebfedde3a6c513dc912c8b94c17283e30bacda409d5fbf85b3a780c5140d638d1e0f81b76e83 -EBUILD tortoisehg-4.7.ebuild 1956 BLAKE2B f7131f22965eef054cbe4381a7282f48fb01c88bd9b943ef0dc24c9d56ba37611da78d519eff5f8165965c03684956cc8521d3f956bbeb5cadbfd71a5eb533a6 SHA512 7b33d80bffac71ffa40e911e3fd50917ed4c18d3938d9bf005841f31d65d0ee47339a1aa8e6c60dce04872aea035827d9e94cd95fda7cc229dc2696e3eba52ef +EBUILD tortoisehg-4.7.2.ebuild 1954 BLAKE2B 1d3c090f6041b99c8029b3550641836b326e85ffb3198501592730ed65fc4106adb76d74297323151595e08d19fbc06cbee07afe67ec8abc0d865a1ae6b92a69 SHA512 6f2f0ed76fb574a7b1edd3ecb0afc45bbef15967d37e3c45db8953e0e71b81eb3705e801564c5e9af882cff9885e7d5b5a94b406f8a698921db678bba22bfe32 EBUILD tortoisehg-9999.ebuild 1956 BLAKE2B 455f8582101c7862cecdba7d683a0fd4eb27c595435ca66819104d94763456c6c8dd4c68f941d9d40b9bc14ff1b73a6c986e4ecdc290d93cd2701b6e53721ae3 SHA512 530d586ce4e1157b10de3a08be0498191827510626e975448ba5dd6e084d5263b14f228043896fab0d87a107ff6f97aa9cfd78b7fe2a505f3f696251d68a56de MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e diff --git a/dev-vcs/tortoisehg/tortoisehg-4.7.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.7.2.ebuild new file mode 100644 index 000000000000..226c31c22223 --- /dev/null +++ b/dev-vcs/tortoisehg/tortoisehg-4.7.2.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 ) + +inherit desktop distutils-r1 + +if [[ ${PV} != *9999* ]]; then + KEYWORDS="~amd64 ~x86" + SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz" + HG_DEPEND=">=dev-vcs/mercurial-4.6 =mercurial-4.0 (bug #599266). + rm "${ED%/}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \ + || die +} + +pkg_postinst() { + elog "When startup of ${PN} fails with an API version mismatch error" + elog "between dev-python/sip and dev-python/PyQt5 please rebuild" + elog "dev-python/qscintilla-python." +} diff --git a/dev-vcs/tortoisehg/tortoisehg-4.7.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.7.ebuild deleted file mode 100644 index 7d152821d138..000000000000 --- a/dev-vcs/tortoisehg/tortoisehg-4.7.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 eutils - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64 ~x86" - SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz" - HG_DEPEND=">=dev-vcs/mercurial-4.6 =mercurial-4.0 (bug #599266). - rm "${ED%/}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \ - || die -} - -pkg_postinst() { - elog "When startup of ${PN} fails with an API version mismatch error" - elog "between dev-python/sip and dev-python/PyQt5 please rebuild" - elog "dev-python/qscintilla-python." -} -- cgit v1.2.3