Drop broken ebuild revisions, re-add keywords on 0.13.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

5 files changed, 8 insertions, 311 deletions

diff --git a/media-gfx/freecad/ChangeLog b/media-gfx/freecad/ChangeLog
index 59332a6f9427..50ef385f5b4b 100644
--- a/media-gfx/freecad/ChangeLog
+++ b/media-gfx/freecad/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/freecad
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.18 2014/04/24 04:48:12 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.19 2014/04/24 13:33:44 xmw Exp $
+
+  24 Apr 2014; Michael Weber <xmw@gentoo.org> -freecad-0.12.5284-r2.ebuild,
+  -freecad-0.12.5284-r3.ebuild, -freecad-0.13.1830.ebuild,
+  freecad-0.13.1830-r1.ebuild:
+  Drop broken ebuild revisions, re-add keywords on 0.13.
 
 *freecad-0.13.1830-r1 (24 Apr 2014)
 
diff --git a/media-gfx/freecad/freecad-0.12.5284-r2.ebuild b/media-gfx/freecad/freecad-0.12.5284-r2.ebuild
deleted file mode 100644
index dc7ea5b04cb3..000000000000
--- a/media-gfx/freecad/freecad-0.12.5284-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r2.ebuild,v 1.7 2013/03/07 15:54:35 axs Exp $
-
-EAPI=4
-PYTHON_DEPEND=2
-
-inherit base multilib fortran-2 flag-o-matic python cmake-utils
-
-MY_P="freecad-${PV}"
-MY_PD="FreeCAD-${PV}"
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="http://sourceforge.net/apps/mediawiki/free-cad/"
-SRC_URI="mirror://sourceforge/free-cad/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-games/ode
-	dev-libs/boost
-	dev-libs/libf2c
-	dev-libs/xerces-c[icu]
-	dev-python/pivy
-	dev-python/PyQt4[svg]
-	media-libs/coin
-	media-libs/SoQt
-	>=sci-libs/opencascade-6.3-r3
-	sci-libs/gts
-	sys-libs/zlib
-	virtual/glu
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsvg:4
-	dev-qt/qtwebkit:4
-	dev-qt/qtxmlpatterns:4"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-2.0.4-r1"
-
-RESTRICT="bindist mirror"
-# http://bugs.gentoo.org/show_bug.cgi?id=352435
-# http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-
-S="${WORKDIR}/${MY_PD}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc46.patch"
-	"${FILESDIR}/${P}-removeoldswig.patch"
-	"${FILESDIR}/${P}-glu.patch"
-	"${FILESDIR}/${P}-nodir.patch"
-	"${FILESDIR}/${P}-nopivy.patch"
-	"${FILESDIR}/${P}-qt3support.patch"
-	"${FILESDIR}/${P}-boost148.patch"
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	base_src_prepare
-	append-cxxflags -fpermissive
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DOCC_INCLUDE_DIR=${CASROOT}/inc
-		-DOCC_INCLUDE_PATH=${CASROOT}/inc
-		-DOCC_LIBRARY=${CASROOT}/lib/libTKernel.so
-		-DOCC_LIBRARY_DIR=${CASROOT}/lib
-		-DOCC_LIB_PATH=${CASROOT}/lib
-		-DCOIN3D_INCLUDE_DIR=/usr/include/coin
-		-DCOIN3D_LIBRARY=/usr/$(get_libdir)/libCoin.so
-		-DSOQT_LIBRARY=/usr/$(get_libdir)/libSoQt.so
-		-DSOQT_INCLUDE_PATH=/usr/include/coin
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	find "${D}" -name "*.la" -exec rm {} +
-
-	dodoc README.Linux ChangeLog.txt
-}
diff --git a/media-gfx/freecad/freecad-0.12.5284-r3.ebuild b/media-gfx/freecad/freecad-0.12.5284-r3.ebuild
deleted file mode 100644
index 694692857a4d..000000000000
--- a/media-gfx/freecad/freecad-0.12.5284-r3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r3.ebuild,v 1.2 2014/04/23 22:49:07 xmw Exp $
-
-EAPI=5
-
-PYTHON_DEPEND=2
-
-inherit eutils multilib fortran-2 python cmake-utils
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="http://sourceforge.net/apps/mediawiki/free-cad/"
-SRC_URI="mirror://sourceforge/free-cad/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-cpp/eigen:3
-	dev-games/ode
-	dev-libs/boost
-	dev-libs/libf2c
-	dev-libs/libspnav[X]
-	dev-libs/xerces-c[icu]
-	dev-python/PyQt4[svg]
-	dev-python/pivy
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsvg:4
-	dev-qt/qtwebkit:4
-	dev-qt/qtxmlpatterns:4
-	media-libs/SoQt
-	media-libs/coin[doc]
-	sci-libs/gts
-	sci-libs/opencascade
-	sys-libs/zlib
-	virtual/glu"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-2.0.4-r1:0"
-
-# http://bugs.gentoo.org/show_bug.cgi?id=352435
-# http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/FreeCAD-${PV}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	einfo remove bundled libs
-	rm -rf src/3rdParty/{Pivy{,-0.5},boost}
-	einfo cleanup build system
-	find . -name "configure*" -print -delete
-
-	epatch \
-		"${FILESDIR}"/${P}-gcc46.patch \
-		"${FILESDIR}"/${P}-removeoldswig.patch \
-		"${FILESDIR}"/${P}-glu.patch \
-		"${FILESDIR}"/${P}-nodir.patch \
-		"${FILESDIR}"/${P}-qt3support.patch \
-		"${FILESDIR}"/${P}-boost148.patch \
-		"${FILESDIR}"/${P}-nopivy.patch \
-		"${FILESDIR}"/${P}-no-permissive.patch
-
-	local my_cas_version=$(eselect opencascade show 2>/dev/null || echo 6.5)
-	if [ "${my_cas_version}" > "6.5.0" ] ; then
-		epatch  "${FILESDIR}"/${P}-occ-6.5.5.patch
-		epatch  "${FILESDIR}"/${P}-salomesmesh-occ-6.5.5.patch
-	fi
-
-	local my_coin_version=$(best_version media-libs/coin)
-	local my_coin_path="${EROOT}"usr/share/doc/${my_coin_version##*/}/html
-	sed -e "s:/usr/share/doc/libcoin60-doc/html:${my_coin_path}:" \
-		-i cMake/FindCoin3DDoc.cmake || die
-
-	sed -e '/FREECAD_BUILD_FEM/s: ON): OFF):' \
-		-i CMakeLists.txt || die
-	#sed -e '/add_subdirectory(Fem)/d' \
-	#	-e '/add_subdirectory(MeshPart)/d' \
-	#	-i src/Mod/CMakeLists.txt || die
-}
-
-src_configure() {
-	local my_occ_env=${EROOT}etc/env.d/50opencascade
-	if [ -e "${EROOT}etc//env.d/51opencascade" ] ; then
-		my_occ_env=${EROOT}etc/env.d/51opencascade
-	fi
-	export CASROOT=$(sed -ne '/^CASROOT=/{s:.*=:: ; p}' $my_occ_env)
-
-	local mycmakeargs=(
-		-DOCC_INCLUDE_DIR="${CASROOT}"/inc
-		-DOCC_INCLUDE_PATH="${CASROOT}"/inc
-		-DOCC_LIBRARY="${CASROOT}"/lib/libTKernel.so
-		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
-		-DOCC_LIB_PATH="${CASROOT}"/lib
-		-DCOIN3D_INCLUDE_DIR="${EROOT}"usr/include/coin
-		-DCOIN3D_LIBRARY="${EROOT}"usr/$(get_libdir)/libCoin.so
-		-DSOQT_LIBRARY="${EROOT}"usr/$(get_libdir)/libSoQt.so
-		-DSOQT_INCLUDE_PATH="${EROOT}"usr/include/coin
-		-DCMAKE_INSTALL_PREFIX="${EROOT}"usr/$(get_libdir)/${P}
-	)
-	cmake-utils_src_configure
-	ewarn "${P} will be built against opencascade version ${CASROOT}"
-}
-
-src_install() {
-	cmake-utils_src_install
-	insinto /usr/$(get_libdir)/${P}/Mod/Start
-	doins -r src/Mod/Start/StartPage
-
-	prune_libtool_files
-
-	make_wrapper FreeCAD \
-		"${EROOT}"usr/$(get_libdir)/${P}/bin/FreeCAD \
-		"" "${EROOT}"usr/$(get_libdir)/${P}/lib
-	make_wrapper FreeCADCmd \
-		"${EROOT}"usr/$(get_libdir)/${P}/bin/FreeCADCmd \
-		"" "${EROOT}"usr/$(get_libdir)/${P}/lib
-
-	newicon src/Main/icon.ico ${PN}.ico
-	make_desktop_entry FreeCAD
-
-	dodoc README.Linux ChangeLog.txt
-}
diff --git a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
index 3e648613f660..e467a23187bc 100644
--- a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.13.1830-r1.ebuild,v 1.1 2014/04/24 04:48:11 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.13.1830-r1.ebuild,v 1.2 2014/04/24 13:33:44 xmw Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/free-cad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="dev-cpp/eigen:3
@@ -69,7 +69,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-CMakefile.patch
 	epatch "${FILESDIR}"/${P}-avoid-include-salome.patch
 	epatch "${FILESDIR}"/${P}-startpage-links.patch
-	#epatch "${FILESDIR}"/startpage.patch
 
 	# disable Machining Distortion workbench because FEM will be disabled in src_configure()
 	# and also because the same module has been removed upstream (commit c0e2c9)
diff --git a/media-gfx/freecad/freecad-0.13.1830.ebuild b/media-gfx/freecad/freecad-0.13.1830.ebuild
deleted file mode 100644
index 6dfc820a387e..000000000000
--- a/media-gfx/freecad/freecad-0.13.1830.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.13.1830.ebuild,v 1.2 2013/05/09 08:36:38 xmw Exp $
-
-EAPI=5
-
-PYTHON_DEPEND=2
-
-inherit eutils multilib fortran-2 python cmake-utils
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="http://www.freecadweb.org/"
-SRC_URI="mirror://sourceforge/free-cad/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="dev-cpp/eigen:3
-	dev-games/ode
-	dev-libs/boost
-	dev-libs/libf2c
-	dev-libs/libspnav[X]
-	dev-libs/xerces-c[icu]
-	dev-python/PyQt4[svg]
-	dev-python/pivy
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsvg:4
-	dev-qt/qtwebkit:4
-	dev-qt/qtxmlpatterns:4
-	media-libs/SoQt
-	media-libs/coin[doc]
-	sci-libs/gts
-	sci-libs/opencascade
-	sys-libs/zlib
-	virtual/glu"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-2.0.4-r1:0"
-
-# http://bugs.gentoo.org/show_bug.cgi?id=352435
-# http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
-RESTRICT="bindist mirror"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	einfo remove bundled libs
-	rm -rf src/3rdParty
-
-	epatch "${FILESDIR}"/${P}-remove-qt3-support.patch
-}
-
-src_configure() {
-	local my_occ_env=${EROOT}etc/env.d/50opencascade
-	if [ -e "${EROOT}etc//env.d/51opencascade" ] ; then
-		my_occ_env=${EROOT}etc/env.d/51opencascade
-	fi
-	export CASROOT=$(sed -ne '/^CASROOT=/{s:.*=:: ; p}' $my_occ_env)
-
-	local mycmakeargs=(
-		-DOCC_INCLUDE_DIR="${CASROOT}"/inc
-		-DOCC_INCLUDE_PATH="${CASROOT}"/inc
-		-DOCC_LIBRARY="${CASROOT}"/lib/libTKernel.so
-		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
-		-DOCC_LIB_PATH="${CASROOT}"/lib
-		-DCOIN3D_INCLUDE_DIR="${EROOT}"usr/include/coin
-		-DCOIN3D_LIBRARY="${EROOT}"usr/$(get_libdir)/libCoin.so
-		-DSOQT_LIBRARY="${EROOT}"usr/$(get_libdir)/libSoQt.so
-		-DSOQT_INCLUDE_PATH="${EROOT}"usr/include/coin
-		-DCMAKE_BINARY_DIR="${EROOT}"usr/bin
-		-DCMAKE_INSTALL_PREFIX="${EROOT}"usr/$(get_libdir)/${P}
-	)
-	cmake-utils_src_configure
-	ewarn "${P} will be built against opencascade version ${CASROOT}"
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	prune_libtool_files
-
-	dodoc README.Linux ChangeLog.txt
-}