summaryrefslogtreecommitdiff
path: root/app-portage/demerge
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-03-23 04:19:44 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-03-23 04:19:44 +0000
commitc5283d322accc6097afec74eab24550829788bab (patch)
treeb99ce668128d82a026eaa31461643f9173f9b77b /app-portage/demerge
parent5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (diff)
gentoo resync : 23.03.2018
Diffstat (limited to 'app-portage/demerge')
-rw-r--r--app-portage/demerge/Manifest2
-rw-r--r--app-portage/demerge/demerge-0.047-r3.ebuild (renamed from app-portage/demerge/demerge-0.047-r2.ebuild)7
2 files changed, 6 insertions, 3 deletions
diff --git a/app-portage/demerge/Manifest b/app-portage/demerge/Manifest
index 9acefb53ccc5..6f260abf0321 100644
--- a/app-portage/demerge/Manifest
+++ b/app-portage/demerge/Manifest
@@ -1,3 +1,3 @@
DIST demerge-0.047.tar.gz 11142 BLAKE2B aba6e40d9a47032782bafe0bfc77f0bdda7e9782daac56712025c6a544db5624a824cfb1db8b32d2dc61a3e3c561432159eb8208bc5da6f94745ec603a457420 SHA512 6c2d172694516c030c358c9668ff4a1fe54d910583de6829bec0de6e67d428b1853b23f6ccd18fc9286932cb9a2bc5a37bab4b5ce43ddf2dd031c64c2ee6b1ce
-EBUILD demerge-0.047-r2.ebuild 1325 BLAKE2B a6ff9d72a4a41a49011744a0670bffcd708d3cb6e2f78d9041e5055acb88501d44629256d99c4c96fafd014d66d0bbe6843d41eca560d29b170687fb8491e21e SHA512 6c02224548af746e9ac1a406267b6dd7f25d147d3443f85e035a20b5ab4ed75b289bb22d1112207b0e09f39a28d3b63df834e779eba70141739ed608d7d9f7ad
+EBUILD demerge-0.047-r3.ebuild 1364 BLAKE2B 8bac5b8fbbdabe89a6e717cde3fbff04110c5ebfa470d2c90e22a75c8df542a6cdc38e2ead434417ef3a1ba19b9ac528de856cf7cfb09847fddc8c3cbf75b272 SHA512 1110ea8a530420726e16673d9043bada92f11b15200df7b86f39dc92eb6d7f17336621551c5037eda1a4c4233ffadc33835c1668ada324ea6425cc6ad84825c2
MISC metadata.xml 473 BLAKE2B b5851d52694607cb0f67dcf21d9d383b1076795e2f2d815b3597b78e149a7f3394312a8d092bc6a96b9e20b592eff074d7b38cc72d7110d4384a65cf28857388 SHA512 084e5b4c139be745f253a91466ad38846d047bca3e5c742a46c8795a47c32d027daf727d7bda4b26cb5fada3b1d77fb820ab52d1c250d67cfcd6591c50c4a97d
diff --git a/app-portage/demerge/demerge-0.047-r2.ebuild b/app-portage/demerge/demerge-0.047-r3.ebuild
index acbdfaaa5e9d..980b9722183b 100644
--- a/app-portage/demerge/demerge-0.047-r2.ebuild
+++ b/app-portage/demerge/demerge-0.047-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,10 @@ DEPEND="dev-lang/perl
dev-perl/TermReadKey
dev-perl/Shell-EnvImporter"
RDEPEND="${DEPEND}
- sys-apps/portage"
+ || (
+ sys-apps/portage
+ sys-apps/portage-mgorny
+ )"
src_prepare() {
# Fix path for new make.conf location