git src and deps array cyclonedds/iceoryx

Signed-off-by: Marius Norvoll Sletten <mariusns@gmail.com>

4 files changed, 36 insertions, 37 deletions

diff --git a/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild b/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild
index 8cae1d3ec..fbdaecca1 100644
--- a/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild
+++ b/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild
@@ -7,9 +7,9 @@ inherit cmake
 
 
 if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
 	EGIT_REPO_URI="https://github.com/eclipse-cyclonedds/"
-	
+	inherit git-r3
+
 else
 
 	SRC_URI="https://github.com/eclipse-cyclonedds/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -31,8 +31,8 @@ RDEPEND=(
 	"shm? ( sys-libs/iceoryx )"
 	"parser? ( sys-devel/bison )"
 )
+DEPEND="${RDEPEND[@]}"
 
-DEPEND="${RDEPEND}"
 
 CMAKE_BUILD_TYPE=Release
 
diff --git a/sys-libs/cyclonedds/cyclonedds-9999.ebuild b/sys-libs/cyclonedds/cyclonedds-9999.ebuild
index dee8af390..fbdaecca1 100644
--- a/sys-libs/cyclonedds/cyclonedds-9999.ebuild
+++ b/sys-libs/cyclonedds/cyclonedds-9999.ebuild
@@ -7,13 +7,13 @@ inherit cmake
 
 
 if [[ ${PV} == *9999 ]] ; then
-    inherit git-r3
-    EGIT_REPO_URI="https://github.com/eclipse-cyclonedds/"
-    
+	EGIT_REPO_URI="https://github.com/eclipse-cyclonedds/"
+	inherit git-r3
+
 else
 
-    SRC_URI="https://github.com/eclipse-cyclonedds/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-    KEYWORDS="~amd64"
+	SRC_URI="https://github.com/eclipse-cyclonedds/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 S="${WORKDIR}/${P}"
@@ -26,41 +26,41 @@ IUSE="test ssl shm parser doc examples ipv6 idlc get_kind"
 RESTRICT="!test? ( test )"
 
 RDEPEND=(
-    "doc? ( app-doc/doxygen )"
-    "ssl? ( dev-libs/openssl )"
-    "shm? ( sys-libs/iceoryx )"
-    "parser? ( sys-devel/bison )"
+	"doc? ( app-doc/doxygen )"
+	"ssl? ( dev-libs/openssl )"
+	"shm? ( sys-libs/iceoryx )"
+	"parser? ( sys-devel/bison )"
 )
+DEPEND="${RDEPEND[@]}"
 
-DEPEND="${RDEPEND}"
 
 CMAKE_BUILD_TYPE=Release
 
 #PATCHES=()
 
 src_prepare() { 
-    use get_kind  &&  eapply  ${FILESDIR}/${PN}-0.10.3-get_kind.patch 
-    cmake_src_prepare
+	use get_kind  &&  eapply  ${FILESDIR}/${PN}-0.10.3-get_kind.patch 
+	cmake_src_prepare
 }
 
 src_configure() {
 
-    local mycmakeargs=(
-     -DBUILD_DOCS= $(usex doc)
-     -DBUILD_DDSPERF=OFF
-     -DBUILD_EXAMPLES=$(usex examples)
+	local mycmakeargs=(
+	 -DBUILD_DOCS= $(usex doc)
+	 -DBUILD_DDSPERF=OFF
+	 -DBUILD_EXAMPLES=$(usex examples)
 
 
-      -DBUILD_TESTING=$(usex test)
-       -DBUILD_IDLC_TESTING=$(usex test)
-       
-       -DBUILD_IDLC=$(usex idlc)
-     -DENABLE_SSL=$(usex ssl)
-      -DENABLE_SECURITY=$(usex ssl)
-      -DENABLE_SECURITY=$(usex ssl)
-      -DENABLE_IPV6=$(usex ipv6)
-      -DENABLE_SHM=$(usex shm)
-    )
+ 	 -DBUILD_TESTING=$(usex test)
+  	 -DBUILD_IDLC_TESTING=$(usex test)
+  	 
+  	 -DBUILD_IDLC=$(usex idlc)
+	 -DENABLE_SSL=$(usex ssl)
+ 	 -DENABLE_SECURITY=$(usex ssl)
+ 	 -DENABLE_SECURITY=$(usex ssl)
+ 	 -DENABLE_IPV6=$(usex ipv6)
+ 	 -DENABLE_SHM=$(usex shm)
+	)
 
-    cmake_src_configure
+	cmake_src_configure
 }
diff --git a/sys-libs/iceoryx/iceoryx-2.0.3.ebuild b/sys-libs/iceoryx/iceoryx-2.0.3.ebuild
index 4a66c2ff1..91a29125b 100644
--- a/sys-libs/iceoryx/iceoryx-2.0.3.ebuild
+++ b/sys-libs/iceoryx/iceoryx-2.0.3.ebuild
@@ -7,9 +7,8 @@ inherit cmake
 
 
 if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
 	EGIT_REPO_URI="https://github.com/eclipse-iceoryx/iceoryx"
-	
+	inherit git-r3	
 else
 	SRC_URI="https://github.com/eclipse-iceoryx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
@@ -28,10 +27,10 @@ RESTRICT="!test? ( test )"
 RDEPEND=(
 	"doc? ( app-doc/doxygen )"
 	"dev-cpp/cpptoml"
-	"ccache? dev-util/ccache"
+	"ccache? ( dev-util/ccache )"
 	)
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND[@]}"
 
 CMAKE_BUILD_TYPE=Release
 
diff --git a/sys-libs/iceoryx/iceoryx-9999.ebuild b/sys-libs/iceoryx/iceoryx-9999.ebuild
index 9a82dbb4c..91a29125b 100644
--- a/sys-libs/iceoryx/iceoryx-9999.ebuild
+++ b/sys-libs/iceoryx/iceoryx-9999.ebuild
@@ -7,8 +7,8 @@ inherit cmake
 
 
 if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
 	EGIT_REPO_URI="https://github.com/eclipse-iceoryx/iceoryx"
+	inherit git-r3	
 else
 	SRC_URI="https://github.com/eclipse-iceoryx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
@@ -27,10 +27,10 @@ RESTRICT="!test? ( test )"
 RDEPEND=(
 	"doc? ( app-doc/doxygen )"
 	"dev-cpp/cpptoml"
-	"ccache? dev-util/ccache"
+	"ccache? ( dev-util/ccache )"
 	)
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND[@]}"
 
 CMAKE_BUILD_TYPE=Release