version bump to 1.4.0, bug #232699; remove old

(Portage version: 2.2_rc6/cvs/Linux 2.6.26.1 i686)

3 files changed, 23 insertions, 91 deletions

diff --git a/media-gfx/aqsis/ChangeLog b/media-gfx/aqsis/ChangeLog
index 21f047e622ee..62cd8778e79d 100644
--- a/media-gfx/aqsis/ChangeLog
+++ b/media-gfx/aqsis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/aqsis
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v 1.14 2008/07/07 21:52:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v 1.15 2008/08/05 22:23:31 maekke Exp $
+
+*aqsis-1.4.0 (05 Aug 2008)
+
+  05 Aug 2008; Markus Meier <maekke@gentoo.org> -aqsis-1.2.0.ebuild,
+  -aqsis-1.3.0_p20080707.ebuild, +aqsis-1.4.0.ebuild:
+  version bump to 1.4.0, bug #232699; remove old
 
 *aqsis-1.3.0_p20080707 (07 Jul 2008)
 
diff --git a/media-gfx/aqsis/aqsis-1.2.0.ebuild b/media-gfx/aqsis/aqsis-1.2.0.ebuild
deleted file mode 100644
index 03c7eb1256a1..000000000000
--- a/media-gfx/aqsis/aqsis-1.2.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-1.2.0.ebuild,v 1.4 2008/01/16 20:24:17 maekke Exp $
-
-inherit versionator multilib
-
-DESCRIPTION="Open source RenderMan-compliant 3D rendering solution"
-HOMEPAGE="http://www.aqsis.org"
-MY_P="${PN}-$(delete_version_separator 3 ${PV})"
-SRC_URI="http://download.aqsis.org/stable/source/tar/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3 ${PV})"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="fltk openexr"
-
-RDEPEND="
-	>=media-libs/tiff-3.7.1
-	>=media-libs/jpeg-6b
-	>=sys-libs/zlib-1.1.4
-	fltk? ( >=x11-libs/fltk-1.1.0 )
-	openexr? ( media-libs/openexr )"
-
-DEPEND="
-	${RDEPEND}
-	dev-libs/libxslt
-	>=dev-libs/boost-1.32.0
-	>=sys-devel/flex-2.5.4
-	sys-devel/bison
-	>=dev-util/scons-0.96.1"
-
-src_compile() {
-
-	if use fltk ; then
-		# hack to get fltk library/include paths
-		# (upstream currently doesn't autodetect the gentoo install path correctly)
-		fltk_version="$(get_version_component_range 1-2 \
-			$(best_version x11-libs/fltk | sed -e 's/^x11-libs\/fltk//'))"
-		fltk_flags="
-			no_fltk=no
-			fltk_include_path=/usr/include/fltk-${fltk_version}
-			fltk_lib_path=/usr/$(get_libdir)/fltk-${fltk_version}"
-	else
-		fltk_flags="no_fltk=yes"
-	fi
-
-	if use openexr ; then
-		exr_flags="
-			no_exr=no
-			exr_include_path=/usr/include/OpenEXR
-			exr_lib_path=/usr/$(get_libdir)"
-	else
-		exr_flags="no_exr=yes"
-	fi
-
-	scons destdir="${D}" \
-		install_prefix=/usr \
-		sysconfdir=/etc \
-		libdir="\$install_prefix/$(get_libdir)" \
-		no_rpath=true \
-		${fltk_flags} \
-		${exr_flags} \
-		build \
-		|| die "Build failed"
-
-		# Option for quickly testing the compile stage
-		# cachedir="/tmp/scons_aq_cache" \
-}
-
-src_install() {
-	scons install
-	dodoc AUTHORS INSTALL README ReleaseNotes
-	# remove a few unwanted files from the std. aqsis install
-	rm $(find "${D}"/usr/share/aqsis/content -name '*.bat')
-}
diff --git a/media-gfx/aqsis/aqsis-1.3.0_p20080707.ebuild b/media-gfx/aqsis/aqsis-1.4.0.ebuild
index cbc3d833a521..b7156e70a50a 100644
--- a/media-gfx/aqsis/aqsis-1.3.0_p20080707.ebuild
+++ b/media-gfx/aqsis/aqsis-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-1.3.0_p20080707.ebuild,v 1.1 2008/07/07 21:52:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-1.4.0.ebuild,v 1.1 2008/08/05 22:23:31 maekke Exp $
 
 EAPI="1"
 
@@ -8,20 +8,25 @@ inherit versionator multilib eutils cmake-utils
 
 DESCRIPTION="Open source RenderMan-compliant 3D rendering solution"
 HOMEPAGE="http://www.aqsis.org"
-_PV=($(get_version_components ${PV}))
-DATE="${_PV[3]/p/}"
-DATE="${DATE:0:4}-${DATE:4:2}-${DATE:6:2}"
-MY_P="${PN}-$(get_version_component_range 1-3)-${DATE}"
-SRC_URI="http://download.aqsis.org/builds/testing/source/tar/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="+fltk openexr"
 
+if [[ "${P}" == *_p* ]] ; then
+	# snapshot
+	_PV=($(get_version_components ${PV}))
+	DATE="${_PV[3]/p/}"
+	DATE="${DATE:0:4}-${DATE:4:2}-${DATE:6:2}"
+	MY_P="${PN}-$(get_version_component_range 1-3)-${DATE}"
+	SRC_URI="http://download.aqsis.org/builds/testing/source/tar/${MY_P}.tar.gz"
+	S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+else
+	SRC_URI="mirror://sourceforge/aqsis/${P}.tar.gz"
+fi
+
 RDEPEND="
+	>=dev-libs/boost-1.34.0
 	>=media-libs/tiff-3.7.1
 	>=sys-libs/zlib-1.1.4
 	fltk? ( >=x11-libs/fltk-1.1.0 )
@@ -30,10 +35,9 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-libs/libxslt
-	>=dev-libs/boost-1.34.0
-	>=sys-devel/flex-2.5.4
+	>=dev-util/cmake-2.4.6
 	>=sys-devel/bison-1.35
-	>=dev-util/cmake-2.4"
+	>=sys-devel/flex-2.5.4"
 
 src_compile() {
 	if use fltk ; then
@@ -63,5 +67,4 @@ src_compile() {
 src_install() {
 	DOCS="AUTHORS INSTALL README ReleaseNotes"
 	cmake-utils_src_install
-	# TODO: Make sure examples are installed.
 }