[gentoo-commits] proj/sci:master commit in: dev-cpp/castxml/files/, dev-cpp/castxml/

[Aisha Tammy]

commit:     9c31a44bb90881749ea9e1eedce9e03cb01bf84d
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Wed Dec 30 20:32:04 2020 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Wed Dec 30 20:32:04 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=9c31a44b

dev-cpp/castxml: version bump to 0.3.6

also fix install paths and EAPI 7

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 dev-cpp/castxml/castxml-0.3.6.ebuild               | 33 ++++++++++++++++++++++
 dev-cpp/castxml/castxml-9999.ebuild                | 33 ++++++++++++----------
 .../files/castxml-0.3.6-install-paths.patch        | 12 ++++++++
 3 files changed, 63 insertions(+), 15 deletions(-)

diff --git a/dev-cpp/castxml/castxml-0.3.6.ebuild b/dev-cpp/castxml/castxml-0.3.6.ebuild
new file mode 100644
index 000000000..dbf7fff49
--- /dev/null
+++ b/dev-cpp/castxml/castxml-0.3.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake llvm
+
+MY_PN="CastXML"
+
+DESCRIPTION="CastXML is a C-family abstract syntax tree XML output tool."
+HOMEPAGE="https://github.com/CastXML/CastXML"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/CastXML/CastXML"
+else
+	SRC_URI="https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="${RDEPEND}"
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+	sys-devel/llvm:=
+	sys-devel/clang:=
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.3.6-install-paths.patch )

diff --git a/dev-cpp/castxml/castxml-9999.ebuild b/dev-cpp/castxml/castxml-9999.ebuild
index 47c25a07f..dbf7fff49 100644
--- a/dev-cpp/castxml/castxml-9999.ebuild
+++ b/dev-cpp/castxml/castxml-9999.ebuild
@@ -1,30 +1,33 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils git-r3 llvm
+inherit cmake llvm
 
 MY_PN="CastXML"
 
 DESCRIPTION="CastXML is a C-family abstract syntax tree XML output tool."
 HOMEPAGE="https://github.com/CastXML/CastXML"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/gerddie/CastXML"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/CastXML/CastXML"
+else
+	SRC_URI="https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="${RDEPEND}"
 RDEPEND="
-		dev-libs/glib:2
-		dev-libs/libxml2
-		sys-devel/llvm:=
-		sys-devel/clang:=
-		"
+	dev-libs/glib:2
+	dev-libs/libxml2
+	sys-devel/llvm:=
+	sys-devel/clang:=
+"
 
-src_test() {
-	cd "${BUILD_DIR}" || die
-	ctest -j 20
-}
+PATCHES=( "${FILESDIR}"/${PN}-0.3.6-install-paths.patch )

diff --git a/dev-cpp/castxml/files/castxml-0.3.6-install-paths.patch b/dev-cpp/castxml/files/castxml-0.3.6-install-paths.patch
new file mode 100644
index 000000000..0b72085b4
--- /dev/null
+++ b/dev-cpp/castxml/files/castxml-0.3.6-install-paths.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 90feea4..4b058a8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -194,5 +194,5 @@ install(DIRECTORY share/castxml/ DESTINATION "${CastXML_INSTALL_DATA_DIR}")
+ install(FILES
+   "LICENSE"
+   "NOTICE"
+-  DESTINATION "${CastXML_INSTALL_DOC_DIR}"
++  DESTINATION "${CastXML_INSTALL_DATA_DIR}"
+   )
+