* [gentoo-commits] proj/sci:master commit in: media-gfx/freecad/files/, media-gfx/freecad/
@ 2011-03-04 23:57 Andreas K. Huettel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas K. Huettel @ 2011-03-04 23:57 UTC (permalink / raw
To: gentoo-commits
commit: d6ddb971fe2b9be21f26822307ba5235ed64ccb3
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri Mar 4 23:58:51 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 4 23:58:51 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d6ddb971
[media-gfx/freecad] Version bump; added required RESTRICT with comments; many cleanups and enhancements
(Portage version: 2.1.9.42/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
media-gfx/freecad/ChangeLog | 8 ++
.../freecad/files/freecad-0.11.3729-asneeded.patch | 12 +++
media-gfx/freecad/freecad-0.11.3729.ebuild | 81 ++++++++++++++++++++
media-gfx/freecad/freecad-0.9.2646.ebuild | 53 -------------
media-gfx/freecad/metadata.xml | 3 +-
5 files changed, 103 insertions(+), 54 deletions(-)
diff --git a/media-gfx/freecad/ChangeLog b/media-gfx/freecad/ChangeLog
index 63e2601..5a10676 100644
--- a/media-gfx/freecad/ChangeLog
+++ b/media-gfx/freecad/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*freecad-0.11.3729 (04 Mar 2011)
+
+ 04 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ -freecad-0.9.2646.ebuild, +freecad-0.11.3729.ebuild,
+ +files/freecad-0.11.3729-asneeded.patch, metadata.xml:
+ Version bump; added required RESTRICT with comments; many cleanups and
+ enhancements
+
04 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+freecad-0.9.2646.ebuild, +metadata.xml:
Moved into media-gfx category
diff --git a/media-gfx/freecad/files/freecad-0.11.3729-asneeded.patch b/media-gfx/freecad/files/freecad-0.11.3729-asneeded.patch
new file mode 100644
index 0000000..fa6ba66
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.11.3729-asneeded.patch
@@ -0,0 +1,12 @@
+diff -ruN FreeCAD-0.10.3205.orig/acinclude.m4 FreeCAD-0.10.3205/acinclude.m4
+--- FreeCAD-0.10.3205.orig/acinclude.m4 2010-06-05 11:16:14.000000000 +0200
++++ FreeCAD-0.10.3205/acinclude.m4 2010-11-07 22:35:02.000000000 +0100
+@@ -374,7 +374,7 @@
+ fi
+
+ # Make sure not to link against X11 libs so that configure succeeds whithout xserver started
+-bnv_try_4="$CXX $fc_qt4_lib_core $LIBS -o myqt myqt.o moc_myqt.o"
++bnv_try_4="$CXX -o myqt myqt.o moc_myqt.o $LIBS $fc_qt4_lib_core"
+ AC_TRY_EVAL(bnv_try_4)
+ if test x"$ac_status" != x0; then
+ AC_MSG_ERROR([Failed to link with Qt, bye...])
diff --git a/media-gfx/freecad/freecad-0.11.3729.ebuild b/media-gfx/freecad/freecad-0.11.3729.ebuild
new file mode 100644
index 0000000..8ca9263
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.11.3729.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+PYTHON_DEPEND=2
+
+inherit base eutils multilib autotools python
+
+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
+ dev-games/ode
+ dev-libs/boost
+ dev-libs/xerces-c
+ dev-python/pivy
+ dev-python/PyQt4
+ media-libs/coin
+ media-libs/SoQt
+ >=sci-libs/opencascade-6.3-r3
+ sci-libs/gts
+ sys-devel/gcc[fortran]
+ sys-libs/zlib
+ x11-libs/qt-gui:4
+ x11-libs/qt-opengl:4
+ x11-libs/qt-svg:4
+ x11-libs/qt-webkit:4
+ x11-libs/qt-xmlpatterns:4
+"
+DEPEND="${RDEPEND}
+ dev-lang/swig"
+
+PATCHES=( "${FILESDIR}/${P}-asneeded.patch" )
+
+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}"
+
+pkg_setup() {
+ python_set_active_version 2
+}
+
+src_prepare() {
+ base_src_prepare
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-qt4-include="${EPREFIX}"/usr/include/qt4 \
+ --with-qt4-bin="${EPREFIX}"//usr/bin \
+ --with-qt4-lib="${EPREFIX}"//usr/$(get_libdir)/qt4 \
+ --with-occ-include=${CASROOT}/inc \
+ --with-occ-lib=${CASROOT}/lib
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "install failed"
+
+ find "${D}" -name "*.la" -exec rm {} +
+
+ dodoc README.Linux ChangeLog.txt || die
+
+ dodir /usr/share/apps/freecad || die
+ mv "${D}/usr/share/freecad.xpm" "${D}/usr/share/apps/freecad/" || die
+
+ make_desktop_entry FreeCAD FreeCAD /usr/share/apps/freecad/freecad.xpm
+}
diff --git a/media-gfx/freecad/freecad-0.9.2646.ebuild b/media-gfx/freecad/freecad-0.9.2646.ebuild
deleted file mode 100644
index 887608e..0000000
--- a/media-gfx/freecad/freecad-0.9.2646.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-
-inherit multilib python
-
-MY_P="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}-2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- sci-libs/opencascade
- x11-libs/qt-gui:4
- x11-libs/qt-svg:4
- x11-libs/qt-webkit:4
- =media-libs/coin-3.1.2
- sci-libs/gts
- sys-libs/zlib
- dev-libs/boost
- dev-python/PyQt4
- dev-libs/xerces-c
- =media-libs/SoQt-1.4.2_alpha1841"
-DEPEND="${RDEPEND}
- dev-lang/swig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- python_set_active_version 2
-}
-
-src_configure () {
- econf \
- --with-qt4-include="${EPREFIX}"/usr/include/qt4 \
- --with-qt4-bin="${EPREFIX}"//usr/bin \
- --with-qt4-lib="${EPREFIX}"//usr/$(get_libdir)/qt4
-}
-
-src_install () {
- emake DESTDIR="${D}" install || die "install failed"
- dodoc README.Linux ChangeLog.txt || die
-}
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index 7e32869..b166de4 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>maintainer-wanted</herd>
+<herd>sci</herd>
+<maintainer><email>dilfridge@gentoo.org</email></maintainer>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: media-gfx/freecad/files/, media-gfx/freecad/
@ 2011-03-06 15:26 Andreas K. Huettel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas K. Huettel @ 2011-03-06 15:26 UTC (permalink / raw
To: gentoo-commits
commit: ac3894e94047b14c31bfad4db62957c69eded6da
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Mar 6 15:28:14 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar 6 15:28:14 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ac3894e9
[media-gfx/freecad] Moved to main portage tree
---
media-gfx/freecad/ChangeLog | 53 -----------
.../freecad/files/freecad-0.11.3729-asneeded.patch | 12 ---
media-gfx/freecad/freecad-0.11.3729.ebuild | 91 --------------------
media-gfx/freecad/metadata.xml | 6 --
4 files changed, 0 insertions(+), 162 deletions(-)
diff --git a/media-gfx/freecad/ChangeLog b/media-gfx/freecad/ChangeLog
deleted file mode 100644
index a56fa0d..0000000
--- a/media-gfx/freecad/ChangeLog
+++ /dev/null
@@ -1,53 +0,0 @@
-# ChangeLog for media-gfx/freecad
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 06 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- freecad-0.11.3729.ebuild:
- Added comment about nature of parallel make failures
-
- 06 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- freecad-0.11.3729.ebuild:
- Add -DBOOST_FILESYSTEM_VERSION=2 workaround for boost-1.45
-
- 05 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- freecad-0.11.3729.ebuild:
- The buildsystem has serious parallel make issues, leading to broken
- moc-generated files
-
-*freecad-0.11.3729 (04 Mar 2011)
-
- 04 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- -freecad-0.9.2646.ebuild, +freecad-0.11.3729.ebuild,
- +files/freecad-0.11.3729-asneeded.patch, metadata.xml:
- Version bump; added required RESTRICT with comments; many cleanups and
- enhancements
-
- 04 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- +freecad-0.9.2646.ebuild, +metadata.xml:
- Moved into media-gfx category
-
- 29 Jun 2010; Justin Lecher <jlec@gentoo.org> freecad-0.9.2646.ebuild:
- Python ABI fixes
-
- 30 Mar 2010; Justin Lecher <jlec@gentoo.org> freecad-0.9.2646.ebuild:
- Changed DEPEND of media-libs/SoQt from 1.4.2_alpha4181 to 1.4.2_alpha1841
-
- 16 Dec 2009; <roelof@gentoo.org> freecad-0.9.2646.ebuild:
- Repairing some depencies
-
- 09 Dec 2009; <roelof@gentoo.org> freecad-0.9.2646.ebuild:
- Added ~x86. Thanks to Derk W. te Bokkel
-
- 09 Dec 2009; <roelof@gentoo.org> freecad-0.9.2646.ebuild:
- Added ~x86 thanks to Derk W te Bokkel
-
- 05 Dec 2009; <r.wobben@hotmail.com> +freecad-0.9.2646.ebuild,
- +metadata.xml:
- Change builder from root to Roelof Wobben
-
-*freecad-0.9.2646 (04 Dec 2009)
-
- 04 Dec 2009; root +freecad-0.9.2646.ebuild, +metadata.xml:
- Initial import of freecad
-
diff --git a/media-gfx/freecad/files/freecad-0.11.3729-asneeded.patch b/media-gfx/freecad/files/freecad-0.11.3729-asneeded.patch
deleted file mode 100644
index fa6ba66..0000000
--- a/media-gfx/freecad/files/freecad-0.11.3729-asneeded.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN FreeCAD-0.10.3205.orig/acinclude.m4 FreeCAD-0.10.3205/acinclude.m4
---- FreeCAD-0.10.3205.orig/acinclude.m4 2010-06-05 11:16:14.000000000 +0200
-+++ FreeCAD-0.10.3205/acinclude.m4 2010-11-07 22:35:02.000000000 +0100
-@@ -374,7 +374,7 @@
- fi
-
- # Make sure not to link against X11 libs so that configure succeeds whithout xserver started
--bnv_try_4="$CXX $fc_qt4_lib_core $LIBS -o myqt myqt.o moc_myqt.o"
-+bnv_try_4="$CXX -o myqt myqt.o moc_myqt.o $LIBS $fc_qt4_lib_core"
- AC_TRY_EVAL(bnv_try_4)
- if test x"$ac_status" != x0; then
- AC_MSG_ERROR([Failed to link with Qt, bye...])
diff --git a/media-gfx/freecad/freecad-0.11.3729.ebuild b/media-gfx/freecad/freecad-0.11.3729.ebuild
deleted file mode 100644
index c000fe4..0000000
--- a/media-gfx/freecad/freecad-0.11.3729.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-PYTHON_DEPEND=2
-
-inherit base eutils multilib autotools flag-o-matic python
-
-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
- dev-games/ode
- dev-libs/boost
- dev-libs/xerces-c
- dev-python/pivy
- dev-python/PyQt4
- media-libs/coin
- media-libs/SoQt
- >=sci-libs/opencascade-6.3-r3
- sci-libs/gts
- sys-devel/gcc[fortran]
- sys-libs/zlib
- x11-libs/qt-gui:4
- x11-libs/qt-opengl:4
- x11-libs/qt-svg:4
- x11-libs/qt-webkit:4
- x11-libs/qt-xmlpatterns:4
-"
-DEPEND="${RDEPEND}
- dev-lang/swig"
-
-PATCHES=( "${FILESDIR}/${P}-asneeded.patch" )
-
-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}"
-
-pkg_setup() {
- python_set_active_version 2
-}
-
-src_prepare() {
- base_src_prepare
- eautoreconf
-}
-
-src_configure() {
- append-cflags "-DBOOST_FILESYSTEM_VERSION=2"
- append-cppflags "-DBOOST_FILESYSTEM_VERSION=2"
- append-cxxflags "-DBOOST_FILESYSTEM_VERSION=2"
- econf \
- --with-qt4-include="${EPREFIX}"/usr/include/qt4 \
- --with-qt4-bin="${EPREFIX}"//usr/bin \
- --with-qt4-lib="${EPREFIX}"//usr/$(get_libdir)/qt4 \
- --with-occ-include=${CASROOT}/inc \
- --with-occ-lib=${CASROOT}/lib
-}
-
-src_compile() {
- # the build system is generating extremely odd errors on parallel build
- # seem like moc is trying to process non-existing files, resulting in
- # double namespace declarations Bla::Bla::Method in the moc_ files
- MAKEOPTS="-j1" base_src_compile
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
-
- find "${D}" -name "*.la" -exec rm {} +
-
- dodoc README.Linux ChangeLog.txt || die
-
- dodir /usr/share/apps/freecad || die
- mv "${D}/usr/share/freecad.xpm" "${D}/usr/share/apps/freecad/" || die
-
- make_desktop_entry FreeCAD FreeCAD /usr/share/apps/freecad/freecad.xpm
-}
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
deleted file mode 100644
index b166de4..0000000
--- a/media-gfx/freecad/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-06 15:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-04 23:57 [gentoo-commits] proj/sci:master commit in: media-gfx/freecad/files/, media-gfx/freecad/ Andreas K. Huettel
-- strict thread matches above, loose matches on Subject: below --
2011-03-06 15:26 Andreas K. Huettel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox