diff options
author | Tim Harder <radhermit@gentoo.org> | 2012-11-24 02:54:41 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2012-11-24 02:54:41 +0000 |
commit | 6a0a9f7509ac5d7916b8076dd2b3b507d40d93f4 (patch) | |
tree | 6d79025fd732fc2e06c47118e4b81834491cfb69 /dev-libs/tinyxml2 | |
parent | Version bump. (diff) | |
download | gentoo-2-6a0a9f7509ac5d7916b8076dd2b3b507d40d93f4.tar.gz gentoo-2-6a0a9f7509ac5d7916b8076dd2b3b507d40d93f4.tar.bz2 gentoo-2-6a0a9f7509ac5d7916b8076dd2b3b507d40d93f4.zip |
Version bump.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'dev-libs/tinyxml2')
-rw-r--r-- | dev-libs/tinyxml2/ChangeLog | 8 | ||||
-rw-r--r-- | dev-libs/tinyxml2/files/tinyxml2-1.0.9_p20121123-test.patch | 20 | ||||
-rw-r--r-- | dev-libs/tinyxml2/tinyxml2-1.0.9_p20121123.ebuild | 35 |
3 files changed, 62 insertions, 1 deletions
diff --git a/dev-libs/tinyxml2/ChangeLog b/dev-libs/tinyxml2/ChangeLog index ed04c04e2914..762987653c7b 100644 --- a/dev-libs/tinyxml2/ChangeLog +++ b/dev-libs/tinyxml2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/tinyxml2 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml2/ChangeLog,v 1.5 2012/09/20 12:39:00 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml2/ChangeLog,v 1.6 2012/11/24 02:54:41 radhermit Exp $ + +*tinyxml2-1.0.9_p20121123 (24 Nov 2012) + + 24 Nov 2012; Tim Harder <radhermit@gentoo.org> + +tinyxml2-1.0.9_p20121123.ebuild, +files/tinyxml2-1.0.9_p20121123-test.patch: + Version bump. 20 Sep 2012; Tim Harder <radhermit@gentoo.org> tinyxml2-1.0.1_p20120531.ebuild: diff --git a/dev-libs/tinyxml2/files/tinyxml2-1.0.9_p20121123-test.patch b/dev-libs/tinyxml2/files/tinyxml2-1.0.9_p20121123-test.patch new file mode 100644 index 000000000000..a6842eecb6e5 --- /dev/null +++ b/dev-libs/tinyxml2/files/tinyxml2-1.0.9_p20121123-test.patch @@ -0,0 +1,20 @@ +--- tinyxml2-1.0.9_p20121123/CMakeLists.txt ++++ tinyxml2-1.0.9_p20121123/CMakeLists.txt +@@ -55,10 +55,13 @@ + VERSION "${GENERIC_LIB_VERSION}"
+ SOVERSION "${GENERIC_LIB_SOVERSION}")
+
+-add_executable(test xmltest.cpp)
+-add_dependencies(test tinyxml2)
+-add_dependencies(test ${TARGET_DATA_COPY})
+-target_link_libraries(test tinyxml2)
++set(BUILD_TEST OFF CACHE BOOL "Set to ON to build tests") ++if(BUILD_TEST) ++ add_executable(test xmltest.cpp) ++ add_dependencies(test tinyxml2) ++ add_dependencies(test ${TARGET_DATA_COPY}) ++ target_link_libraries(test tinyxml2) ++endif(BUILD_TEST) +
+
+ if(BUILD_STATIC_LIBS)
diff --git a/dev-libs/tinyxml2/tinyxml2-1.0.9_p20121123.ebuild b/dev-libs/tinyxml2/tinyxml2-1.0.9_p20121123.ebuild new file mode 100644 index 000000000000..fc18e42af696 --- /dev/null +++ b/dev-libs/tinyxml2/tinyxml2-1.0.9_p20121123.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml2/tinyxml2-1.0.9_p20121123.ebuild,v 1.1 2012/11/24 02:54:41 radhermit Exp $ + +EAPI="5" +CMAKE_MIN_VERSION="2.8.5" + +inherit cmake-utils + +DESCRIPTION="A simple, small, efficient, C++ XML parser" +HOMEPAGE="http://www.grinninglizard.com/tinyxml2/" +SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.bz2" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="static-libs test" + +PATCHES=( + "${FILESDIR}"/${P}-test.patch + "${FILESDIR}"/${PN}-1.0.1_p20120531-test-return-status.patch +) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_build static-libs STATIC_LIBS) + $(cmake-utils_use_build test TEST) + ) + cmake-utils_src_configure +} + +src_test() { + cmake-utils_src_test + ./test || die "Tests failed" +} |