diff options
| -rw-r--r-- | media-libs/SoQt/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/SoQt/SoQt-1.4.1.ebuild | 47 | ||||
| -rw-r--r-- | media-libs/SoQt/SoQt-1.5.0-r1.ebuild | 40 | ||||
| -rw-r--r-- | media-libs/SoQt/metadata.xml | 6 |
4 files changed, 27 insertions, 72 deletions
diff --git a/media-libs/SoQt/ChangeLog b/media-libs/SoQt/ChangeLog index dc787048b858..c4af88beaa35 100644 --- a/media-libs/SoQt/ChangeLog +++ b/media-libs/SoQt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/SoQt # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/ChangeLog,v 1.33 2012/05/05 08:02:33 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/ChangeLog,v 1.34 2012/12/26 14:38:11 jlec Exp $ + + 26 Dec 2012; Justin Lecher <jlec@gentoo.org> -SoQt-1.4.1.ebuild, + SoQt-1.5.0-r1.ebuild, metadata.xml: + Drop old; move to EAPI=5 and autotools-utils.eclass 05 May 2012; Jeff Horelick <jdhore@gentoo.org> SoQt-1.4.1.ebuild, SoQt-1.5.0-r1.ebuild: diff --git a/media-libs/SoQt/SoQt-1.4.1.ebuild b/media-libs/SoQt/SoQt-1.4.1.ebuild deleted file mode 100644 index 46e14408a81e..000000000000 --- a/media-libs/SoQt/SoQt-1.4.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/SoQt-1.4.1.ebuild,v 1.8 2012/05/05 08:02:33 jdhore Exp $ - -EAPI="2" - -inherit flag-o-matic eutils - -DESCRIPTION="The glue between Coin3D and Qt" -SRC_URI="ftp://ftp.coin3d.org/pub/coin/src/all/${P}.tar.gz" -HOMEPAGE="http://www.coin3d.org/" - -SLOT="0" -LICENSE="|| ( GPL-2 PEL )" -KEYWORDS="~amd64 x86" -IUSE="doc" - -RDEPEND=">=media-libs/coin-2.4.4 - x11-libs/qt-gui:4[qt3support] - x11-libs/qt-opengl:4[qt3support] - x11-libs/qt-qt3support:4" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen )" - -src_prepare() { - epatch "${FILESDIR}/${P}-gcc44.patch" -} - -src_configure() { - export PATH="/usr/bin/:${PATH}" - export QTDIR="/usr" - export CONFIG_QTLIBS="$(pkg-config --libs QtGui)" - - append-ldflags $(no-as-needed) - - econf --with-coin --disable-html-help $(use_enable doc html) htmldir=/usr/share/doc/${PF}/html -} - -src_compile() { - emake -j1 || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog NEWS README* -} diff --git a/media-libs/SoQt/SoQt-1.5.0-r1.ebuild b/media-libs/SoQt/SoQt-1.5.0-r1.ebuild index 52489d088906..96b5f4a5e3ef 100644 --- a/media-libs/SoQt/SoQt-1.5.0-r1.ebuild +++ b/media-libs/SoQt/SoQt-1.5.0-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/SoQt-1.5.0-r1.ebuild,v 1.4 2012/05/05 08:02:33 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/SoQt-1.5.0-r1.ebuild,v 1.5 2012/12/26 14:38:11 jlec Exp $ -EAPI="2" +EAPI=5 -inherit base +inherit autotools-utils DESCRIPTION="The glue between Coin3D and Qt" SRC_URI="http://ftp.coin3d.org/coin/src/all/${P}.tar.gz" @@ -34,27 +34,25 @@ PATCHES=( DOCS=(AUTHORS ChangeLog FAQ HACKING NEWS README) src_configure() { - econf \ - htmldir="/usr/share/doc/${PF}/html" \ - --disable-compact \ - --disable-html-help \ - --disable-loadlibrary \ - --disable-man \ - --enable-pkgconfig \ - --includedir="/usr/include/coin" \ - --with-coin \ - $(use_enable debug) \ - $(use_enable debug symbols) \ - $(use_enable doc html) \ - $(use_enable static-libs static) + local myeconfargs=( + htmldir="/usr/share/doc/${PF}/html" + --disable-compact + --disable-html-help + --disable-loadlibrary + --disable-man + --enable-pkgconfig + --includedir="/usr/include/coin" + --with-coin + $(use_enable debug) + $(use_enable debug symbols) + $(use_enable doc html) + ) + autotools-utils_src_configure } src_install() { # Remove SoQt from Libs.private - sed -e '/Libs.private/s/ -lSoQt//' -i SoQt.pc || die + sed -e '/Libs.private/s/ -lSoQt//' -i "${BUILD_DIR}"/SoQt.pc || die - base_src_install - - # Remove libtool files when not needed. - use static-libs || rm -f "${D}"/usr/lib*/*.la + autotools-utils_src_install } diff --git a/media-libs/SoQt/metadata.xml b/media-libs/SoQt/metadata.xml index f0cffc818b2e..e6b9e2af1395 100644 --- a/media-libs/SoQt/metadata.xml +++ b/media-libs/SoQt/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer> - <email>reavertm@gentoo.org</email> - </maintainer> + <maintainer> + <email>reavertm@gentoo.org</email> + </maintainer> </pkgmetadata> |