diff options
author | Pacho Ramos <pacho@gentoo.org> | 2016-07-26 20:52:40 +0200 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2016-07-26 20:52:40 +0200 |
commit | 62d8f8201378529ebba39b444c5bc99620f4339c (patch) | |
tree | 461ede72cd1759946313465149e1a8e59f5ee048 /app-admin | |
parent | dev-libs/libtasn1: version bump (diff) | |
parent | sys-apps/entropy: version bump to 302 (diff) | |
download | gentoo-62d8f8201378529ebba39b444c5bc99620f4339c.tar.gz gentoo-62d8f8201378529ebba39b444c5bc99620f4339c.tar.bz2 gentoo-62d8f8201378529ebba39b444c5bc99620f4339c.zip |
Merge remote-tracking branch 'github/pr/1633', bug 527306 by Ettore Di Giacinto
Diffstat (limited to 'app-admin')
-rw-r--r-- | app-admin/equo/Manifest | 2 | ||||
-rw-r--r-- | app-admin/equo/equo-302.ebuild (renamed from app-admin/equo/equo-254.ebuild) | 9 | ||||
-rw-r--r-- | app-admin/matter/Manifest | 2 | ||||
-rw-r--r-- | app-admin/matter/matter-302.ebuild (renamed from app-admin/matter/matter-254.ebuild) | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/app-admin/equo/Manifest b/app-admin/equo/Manifest index 520d012e476c..0fcdde83a7fc 100644 --- a/app-admin/equo/Manifest +++ b/app-admin/equo/Manifest @@ -1 +1 @@ -DIST entropy-254.tar.bz2 18516662 SHA256 5e411472eaf7016a68a4aa81ef92dd3aad8403fc65a0ffb09c57b91c959ca3a6 SHA512 3b3e82abad8008720e370b7892b7be1c48aaa6605914db977f68b9a108ada0a4adbaa5b7b50a9a02ba9c8b0bdefadcda1eceee2c7c2abc385b3daf669649e2da WHIRLPOOL 593469b858707e4ceca56146fa1d608141e44dda0a0921ed6a3ec566878c1e3c153410233f088d57db4f8bd9d1c796bd945cbea3ba455572efc05eca42023ce5 +DIST entropy-302.tar.bz2 1701434 SHA256 968267d65d3a4f1480fb1d4eac43f33777efe0b4486c80f9b3baef093f052f95 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e WHIRLPOOL e03a7669d9c98a2a060822f5000d859158724730d172e536da7577c365864109990ea9e7fe143f5a8fa496474d637b57a93e18dc39f6282037e0f7941a4eba43 diff --git a/app-admin/equo/equo-254.ebuild b/app-admin/equo/equo-302.ebuild index a6987439d5b8..90026e7d48d5 100644 --- a/app-admin/equo/equo-254.ebuild +++ b/app-admin/equo/equo-302.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -19,9 +19,12 @@ SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2" S="${WORKDIR}/entropy-${PV}" -DEPEND="${PYTHON_DEPS} +COMMON_DEPEND="${PYTHON_DEPS} ~sys-apps/entropy-${PV}[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND} sys-apps/file[python]" +DEPEND="${COMMON_DEPEND} + app-text/asciidoc" +RDEPEND="${COMMON_DEPEND} + sys-apps/file[python]" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/app-admin/matter/Manifest b/app-admin/matter/Manifest index 520d012e476c..0fcdde83a7fc 100644 --- a/app-admin/matter/Manifest +++ b/app-admin/matter/Manifest @@ -1 +1 @@ -DIST entropy-254.tar.bz2 18516662 SHA256 5e411472eaf7016a68a4aa81ef92dd3aad8403fc65a0ffb09c57b91c959ca3a6 SHA512 3b3e82abad8008720e370b7892b7be1c48aaa6605914db977f68b9a108ada0a4adbaa5b7b50a9a02ba9c8b0bdefadcda1eceee2c7c2abc385b3daf669649e2da WHIRLPOOL 593469b858707e4ceca56146fa1d608141e44dda0a0921ed6a3ec566878c1e3c153410233f088d57db4f8bd9d1c796bd945cbea3ba455572efc05eca42023ce5 +DIST entropy-302.tar.bz2 1701434 SHA256 968267d65d3a4f1480fb1d4eac43f33777efe0b4486c80f9b3baef093f052f95 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e WHIRLPOOL e03a7669d9c98a2a060822f5000d859158724730d172e536da7577c365864109990ea9e7fe143f5a8fa496474d637b57a93e18dc39f6282037e0f7941a4eba43 diff --git a/app-admin/matter/matter-254.ebuild b/app-admin/matter/matter-302.ebuild index 79ee96884406..d7663ddd011d 100644 --- a/app-admin/matter/matter-254.ebuild +++ b/app-admin/matter/matter-302.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ |