gentoo resync : 18.08.2019

1 files changed, 24 insertions, 26 deletions

diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index 12db86f7f160..b54197dd4535 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -9,23 +9,22 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
-	dvar=9fcd89593f8b7fb5c9f1c32f0b82f518eda4be46
-	ini=979a18fdd59f05f927d6cdf624d8ded6f81c6776
-	list=dda36d30c7d655b4d61358519168fa7ce0e9dae9
-	rbtree=bf627e0c32241915108f66ad9738444e4d045b45
-	shquote=b7e325c7ff098787f2937dd91597677374f038b6
-	sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
-	utf8=b245df543717ee19ad398f8139447e3807c11c96
-	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz
-		https://github.com/c-util/c-dvar/archive/${dvar}/c-dvar-${dvar}.tar.gz
-		https://github.com/c-util/c-ini/archive/${ini}/c-ini-${ini}.tar.gz
-		https://github.com/c-util/c-list/archive/${list}/c-list-${list}.tar.gz
-		https://github.com/c-util/c-rbtree/archive/${rbtree}/c-rbtree-${rbtree}.tar.gz
-		https://github.com/c-util/c-shquote/archive/${shquote}/c-shquote-${shquote}.tar.gz
-		https://github.com/c-util/c-sundry/archive/${sundry}/c-sundry-${sundry}.tar.gz
-		https://github.com/c-util/c-utf8/archive/${utf8}/c-utf8-${utf8}.tar.gz
-	"
 	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
+	declare -Ag SUBPROJECTS=(
+		[c-dvar]=7c0833f9cae446163077b204b2296287bbee7c67
+		[c-ini]=847c55f5b3d33baa47af9a1286175d58b34f91d5
+		[c-list]=2e4b605c6217cd3c8a1ef773f82f5cc329ba650d
+		[c-rbtree]=b46392d25de7a7bab67d48ef18bf8350b429cff5
+		[c-shquote]=34e1e25299fb82ab9fd0c8bfd8a66010ead1497b
+		[c-stdaux]=11930d259212605a15430523472ef54e0c7654ee
+		[c-utf8]=34f5df0f4b28fc7ea6747680a432e666047082e4
+	)
+	for sp in "${!SUBPROJECTS[@]}"; do
+		commit=${SUBPROJECTS[${sp}]}
+		SRC_URI+=" https://github.com/c-util/${sp}/archive/${commit}/${sp}-${commit}.tar.gz"
+	done
+	unset sp commit
 fi
 
 DESCRIPTION="Linux D-Bus Message Broker"
@@ -35,7 +34,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="audit doc +launcher selinux"
 
-RDEPEND="
+DEPEND="
 	audit? (
 		>=sys-process/audit-2.7
 		>=sys-libs/libcap-ng-0.6
@@ -46,7 +45,8 @@ RDEPEND="
 	)
 	selinux? ( sys-libs/libselinux )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+	launcher? ( sys-apps/dbus )"
 BDEPEND="
 	doc? ( dev-python/docutils )
 	dev-python/docutils
@@ -55,14 +55,12 @@ BDEPEND="
 
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
-		rmdir subprojects/c-{dvar,ini,list,rbtree,shquote,sundry,utf8} || die
-		mv "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die
-		mv "${WORKDIR}/c-ini-${ini}" subprojects/c-ini || die
-		mv "${WORKDIR}/c-list-${list}" subprojects/c-list || die
-		mv "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die
-		mv "${WORKDIR}/c-shquote-${shquote}" subprojects/c-shquote || die
-		mv "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die
-		mv "${WORKDIR}/c-utf8-${utf8}" subprojects/c-utf8 || die
+		local sp commit
+		for sp in "${!SUBPROJECTS[@]}"; do
+			commit=${SUBPROJECTS[${sp}]}
+			rmdir "subprojects/${sp}" || die
+			mv "${WORKDIR}/${sp}-${commit}" "subprojects/${sp}" || die
+		done
 	fi
 	default
 }