Version bump and live ebuild, based on work by Andreas Sturmlechner, bug 486018

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)

7 files changed, 275 insertions, 2 deletions

diff --git a/media-libs/opencollada/ChangeLog b/media-libs/opencollada/ChangeLog
index 6b8039ca2dd6..0089c68f93fe 100644
--- a/media-libs/opencollada/ChangeLog
+++ b/media-libs/opencollada/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-libs/opencollada
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/ChangeLog,v 1.6 2012/12/01 18:32:28 blueness Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/ChangeLog,v 1.7 2015/02/08 00:19:57 dilfridge Exp $
+
+*opencollada-9999 (08 Feb 2015)
+*opencollada-1.2.2_p20150207 (08 Feb 2015)
+
+  08 Feb 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +opencollada-1.2.2_p20150207.ebuild, +opencollada-9999.ebuild,
+  +files/opencollada-1.2.2-libdir.patch,
+  +files/opencollada-1.2.2-no-undefined.patch,
+  +files/opencollada-1.2.2-soversion.patch, metadata.xml:
+  Version bump and live ebuild, based on work by Andreas Sturmlechner, bug
+  486018
 
   01 Dec 2012; Anthony G. Basile <blueness@gentoo.org>
   opencollada-0_p864-r1.ebuild:
diff --git a/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch b/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch
new file mode 100644
index 000000000000..cc413f3ededc
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch
@@ -0,0 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 96ccb32..c2673f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -146,6 +146,9 @@ set(OPENCOLLADA_VERSION_MINOR 1)
+ set(OPENCOLLADA_VERSION_PATCH 0)
+ set(OPENCOLLADA_VERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH})
+ 
++#-----------------------------------------------------------------------------
++# Generic install paths
++include(GNUInstallDirs)
+ 
+ #-----------------------------------------------------------------------------
+ # Compiler warnings.
+@@ -178,9 +181,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_WARNINGS}")
+ #-----------------------------------------------------------------------------
+ # Install vars
+ 
+-set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_PREFIX}/include/opencollada)
+-set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/opencollada)
+-set(OPENCOLLADA_INST_CMAKECONFIG ${OPENCOLLADA_INST_LIBRARY}/cmake)
++set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_FULL_INCLUDEDIR}/opencollada)
++set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_FULL_LIBDIR}/opencollada)
++set(OPENCOLLADA_INST_CMAKECONFIG ${CMAKE_INSTALL_FULL_LIBDIR}/opencollada/cmake)
+ 
+ 
+ #-----------------------------------------------------------------------------
diff --git a/media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch b/media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch
new file mode 100644
index 000000000000..e3cbf0dbead9
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch
@@ -0,0 +1,35 @@
+Source: https://build.opensuse.org/package/show/graphics/openCOLLADA
+
+Index: OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/common/libBuffer/CMakeLists.txt
+===================================================================
+--- OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c.orig/common/libBuffer/CMakeLists.txt
++++ OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/common/libBuffer/CMakeLists.txt
+@@ -28,7 +28,10 @@ set(SRC
+ 	include/performanceTest/performanceTest.h
+ )
+ 
+-set(TARGET_LIBS ftoa)
++set(TARGET_LIBS
++	ftoa
++	UTF
++)
+ 
+ include_directories(
+ 	${libBuffer_include_dirs}
+Index: OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/CMakeLists.txt
+===================================================================
+--- OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c.orig/CMakeLists.txt
++++ OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/CMakeLists.txt
+@@ -244,10 +244,10 @@ else ()  # if pcre not found building it
+ endif ()
+ 
+ # building required libs
++add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)                                    
++add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
+ add_subdirectory(common/libftoa)
+ add_subdirectory(common/libBuffer)
+-add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)
+-add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
+ 
+ # building OpenCOLLADA libs
+ add_subdirectory(COLLADABaseUtils)
diff --git a/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch b/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch
new file mode 100644
index 000000000000..beef35545538
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch
@@ -0,0 +1,15 @@
+Source:
+https://build.opensuse.org/package/show/graphics/openCOLLADA
+
+diff -Naur OpenCOLLADA.orig/CMakeLists.txt OpenCOLLADA/CMakeLists.txt
+--- OpenCOLLADA.orig/CMakeLists.txt	2013-08-10 02:00:51.000000000 -0500
++++ OpenCOLLADA/CMakeLists.txt	2013-08-28 10:34:50.122102989 -0500
+@@ -77,7 +77,7 @@
+ 			message(${name} " WARNING: Shared library support implemented for UNIX-like OS only")
+ 		endif ()
+ 		add_library(${name}_shared SHARED ${sources})
+-		set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name})
++		set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion})
+ 		foreach(target_lib ${target_libs})
+ 			if(TARGET ${target_lib}_shared)
+ 				target_link_libraries(${name}_shared ${target_lib}_shared)
diff --git a/media-libs/opencollada/metadata.xml b/media-libs/opencollada/metadata.xml
index 16bcc9f800a2..99a19273fd9e 100644
--- a/media-libs/opencollada/metadata.xml
+++ b/media-libs/opencollada/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>openoffice</herd>
 	<maintainer>
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
diff --git a/media-libs/opencollada/opencollada-1.2.2_p20150207.ebuild b/media-libs/opencollada/opencollada-1.2.2_p20150207.ebuild
new file mode 100644
index 000000000000..4196f2b75979
--- /dev/null
+++ b/media-libs/opencollada/opencollada-1.2.2_p20150207.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/opencollada-1.2.2_p20150207.ebuild,v 1.1 2015/02/08 00:19:57 dilfridge Exp $
+
+EAPI=5
+
+if [[ ${PV} == *9999* ]] ; then
+	SCM_ECLASS="git-r3"
+else
+	SCM_ECLASS="vcs-snapshot"
+fi
+
+inherit versionator eutils multilib cmake-utils ${SCM_ECLASS}
+
+DESCRIPTION="Stream based read/write library for COLLADA files"
+HOMEPAGE="http://www.opencollada.org/"
+LICENSE="MIT"
+IUSE="expat"
+
+# seems like the Khronos Group hasnt invented the SOVERSION yet
+MY_SOVERSION="1.2"
+
+SLOT="0"
+
+if [[ ${PV} != *9999* ]]; then
+	#
+	# UPDATE THE COMMIT WHEN BUMPING!
+	COMMIT="ceb409cabdccda3000aa2e5c065850b8fde60b0f"
+	#
+	SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/tarball/${COMMIT} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+else
+	EGIT_REPO_URI="http://github.com/KhronosGroup/OpenCOLLADA.git"
+fi
+
+RDEPEND="dev-libs/libpcre
+	dev-libs/zziplib
+	media-libs/lib3ds
+	sys-libs/zlib
+	>=sys-devel/gcc-4.7
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}
+	sys-apps/findutils
+	sys-apps/sed"
+
+BUILD_DIR="${S}"/build
+
+src_prepare() {
+
+	# Remove some bundled dependencies
+	edos2unix CMakeLists.txt || die
+
+	epatch "${FILESDIR}"/${PN}-0_p864-expat.patch
+
+	epatch "${FILESDIR}"/${PN}-1.2.2-soversion.patch
+	epatch "${FILESDIR}"/${PN}-1.2.2-no-undefined.patch
+	epatch "${FILESDIR}"/${PN}-1.2.2-libdir.patch
+
+	rm -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
+	ewarn "$(echo "Remaining bundled dependencies:";
+		find Externals -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
+
+	# Remove unused build systems
+	rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
+	find "${S}" -name SConscript -delete || die
+}
+
+src_configure() {
+	local mycmakeargs=" -DUSE_SHARED=ON -DUSE_STATIC=OFF"
+
+	# Master CMakeLists.txt says "EXPAT support not implemented"
+	# Something like "set(LIBEXPAT_LIBRARIES expat)" is missing to make it build
+	use expat \
+		&& mycmakeargs+=' -DUSE_EXPAT=ON -DUSE_LIBXML=OFF' \
+		|| mycmakeargs+=' -DUSE_EXPAT=OFF -DUSE_LIBXML=ON'
+
+	# Seems like the Khronos Group hasnt invented the SOVERSION yet.
+	mycmakeargs+=" -Dsoversion=${MY_SOVERSION}"
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodir /etc/env.d || die
+	echo "LDPATH=/usr/$(get_libdir)/opencollada" \
+			> "${D}"/etc/env.d/99opencollada || die
+
+	dobin build/bin/OpenCOLLADAValidator || die
+}
diff --git a/media-libs/opencollada/opencollada-9999.ebuild b/media-libs/opencollada/opencollada-9999.ebuild
new file mode 100644
index 000000000000..8644c3e185ef
--- /dev/null
+++ b/media-libs/opencollada/opencollada-9999.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/opencollada-9999.ebuild,v 1.1 2015/02/08 00:19:57 dilfridge Exp $
+
+EAPI=5
+
+if [[ ${PV} == *9999* ]] ; then
+	SCM_ECLASS="git-r3"
+else
+	SCM_ECLASS="vcs-snapshot"
+fi
+
+inherit versionator eutils multilib cmake-utils ${SCM_ECLASS}
+
+DESCRIPTION="Stream based read/write library for COLLADA files"
+HOMEPAGE="http://www.opencollada.org/"
+LICENSE="MIT"
+IUSE="expat"
+
+# seems like the Khronos Group hasnt invented the SOVERSION yet
+MY_SOVERSION="1.2"
+
+SLOT="0"
+
+if [[ ${PV} != *9999* ]]; then
+	#
+	# UPDATE THE COMMIT WHEN BUMPING!
+	COMMIT="ceb409cabdccda3000aa2e5c065850b8fde60b0f"
+	#
+	SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/tarball/${COMMIT} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+else
+	EGIT_REPO_URI="http://github.com/KhronosGroup/OpenCOLLADA.git"
+fi
+
+RDEPEND="dev-libs/libpcre
+	dev-libs/zziplib
+	media-libs/lib3ds
+	sys-libs/zlib
+	>=sys-devel/gcc-4.7
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}
+	sys-apps/findutils
+	sys-apps/sed"
+
+BUILD_DIR="${S}"/build
+
+src_prepare() {
+
+	# Remove some bundled dependencies
+	edos2unix CMakeLists.txt || die
+
+	epatch "${FILESDIR}"/${PN}-0_p864-expat.patch
+
+	epatch "${FILESDIR}"/${PN}-1.2.2-soversion.patch
+	epatch "${FILESDIR}"/${PN}-1.2.2-no-undefined.patch
+	epatch "${FILESDIR}"/${PN}-1.2.2-libdir.patch
+
+	rm -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
+	ewarn "$(echo "Remaining bundled dependencies:";
+		find Externals -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
+
+	# Remove unused build systems
+	rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
+	find "${S}" -name SConscript -delete || die
+}
+
+src_configure() {
+	local mycmakeargs=" -DUSE_SHARED=ON -DUSE_STATIC=OFF"
+
+	# Master CMakeLists.txt says "EXPAT support not implemented"
+	# Something like "set(LIBEXPAT_LIBRARIES expat)" is missing to make it build
+	use expat \
+		&& mycmakeargs+=' -DUSE_EXPAT=ON -DUSE_LIBXML=OFF' \
+		|| mycmakeargs+=' -DUSE_EXPAT=OFF -DUSE_LIBXML=ON'
+
+	# Seems like the Khronos Group hasnt invented the SOVERSION yet.
+	mycmakeargs+=" -Dsoversion=${MY_SOVERSION}"
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodir /etc/env.d || die
+	echo "LDPATH=/usr/$(get_libdir)/opencollada" \
+			> "${D}"/etc/env.d/99opencollada || die
+
+	dobin build/bin/OpenCOLLADAValidator || die
+}