Version bump.

(Portage version: 2.1.3.9)

5 files changed, 54 insertions, 47 deletions

diff --git a/sci-libs/liborigin/ChangeLog b/sci-libs/liborigin/ChangeLog
index d0deeeb3df54..978a67c9088a 100644
--- a/sci-libs/liborigin/ChangeLog
+++ b/sci-libs/liborigin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/liborigin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.5 2007/08/01 17:20:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.6 2007/09/20 15:39:43 bicatali Exp $
+
+*liborigin-20070821 (20 Sep 2007)
+
+  20 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  -liborigin-20070115.ebuild, +liborigin-20070821.ebuild:
+  Version bump.
 
 *liborigin-20070529 (01 Aug 2007)
 
diff --git a/sci-libs/liborigin/files/digest-liborigin-20070115 b/sci-libs/liborigin/files/digest-liborigin-20070115
deleted file mode 100644
index cb1941fc605d..000000000000
--- a/sci-libs/liborigin/files/digest-liborigin-20070115
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5ed1c7c0955f935d3b4e45fb25e1d7fc liborigin-20070115.tgz 20308
-RMD160 6531fb562e390a4a9afc64f56af78ce7b8316e10 liborigin-20070115.tgz 20308
-SHA256 125de16ffc055102bd0aaf31de71ad5daeefc962aea97723b75611800f9ecd38 liborigin-20070115.tgz 20308
diff --git a/sci-libs/liborigin/files/digest-liborigin-20070821 b/sci-libs/liborigin/files/digest-liborigin-20070821
new file mode 100644
index 000000000000..ad0676bd58de
--- /dev/null
+++ b/sci-libs/liborigin/files/digest-liborigin-20070821
@@ -0,0 +1,3 @@
+MD5 c08c5c5656e9bcf15107185d95e868d5 liborigin-2007-08-21.tar.gz 45977
+RMD160 00fe891cc6b34aed41318821bbb01a709bc3fbb8 liborigin-2007-08-21.tar.gz 45977
+SHA256 7efe0fcbddc44c5d66b34ebb9bad6662864b919ba5b3ee166c991f554fc179f9 liborigin-2007-08-21.tar.gz 45977
diff --git a/sci-libs/liborigin/liborigin-20070115.ebuild b/sci-libs/liborigin/liborigin-20070115.ebuild
deleted file mode 100644
index e1bf61e1d04e..000000000000
--- a/sci-libs/liborigin/liborigin-20070115.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20070115.ebuild,v 1.2 2007/05/06 14:34:13 carlo Exp $
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="A library for reading OriginLab OPJ project files"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-HOMEPAGE="http://sourceforge.net/projects/liborigin/"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-
-SLOT="0"
-IUSE=""
-
-DEPEND="!<sci-visualization/labplot-1.5.1.6"
-RESTRICT="test"
-
-src_compile() {
-	# the Makefile.LINUX is very basic, and *both* (and the only) "action" lines
-	# need to be adjusted. It is easier to simply build stuff in a proper way
-	# directly here.
-	$(tc-getCXX) \
-		${CXXFLAGS} \
-		OPJFile.cpp \
-		-shared -Wl,-soname,liborigin.so.0 -fPIC \
-		-o liborigin.so.0.0.1 || die "lib compilation failed"
-	$(tc-getCXX) \
-		${CXXFLAGS} \
-		opj2dat.cpp OPJFile.cpp \
-		-o opj2dat || die "exec compilation failed"
-}
-
-src_install() {
-	dolib liborigin.so.0.0.1 || die "dolib failed"
-	dosym liborigin.so.0.0.1 /usr/$(get_libdir)/liborigin.so.0
-	dosym liborigin.so.0 /usr/$(get_libdir)/liborigin.so
-	dobin opj2dat || die "dobin failed"
-	dodoc README ws4.opj || die "dodoc failed"
-	insinto /usr/include
-	doins OPJFile.h || die "doins failed"
-}
diff --git a/sci-libs/liborigin/liborigin-20070821.ebuild b/sci-libs/liborigin/liborigin-20070821.ebuild
new file mode 100644
index 000000000000..4ef8bcf01b2a
--- /dev/null
+++ b/sci-libs/liborigin/liborigin-20070821.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20070821.ebuild,v 1.1 2007/09/20 15:39:43 bicatali Exp $
+
+inherit multilib
+
+MY_P=${PN}-${PV:0:4}-${PV:4:2}-${PV:6:2}
+
+DESCRIPTION="A library for reading OriginLab OPJ project files"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://sourceforge.net/projects/liborigin/"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+
+SLOT="0"
+IUSE=""
+
+DEPEND="!<sci-visualization/labplot-1.5.1.6"
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	# CC is defined as a C++ compiler in the Makefile
+	sed -i \
+		-e '/^CC.*=/d' \
+		-e 's/CC/CXX/g' \
+		-e 's/CFLAGS.*=/CXXFLAGS +=/' \
+		-e 's/CFLAGS/CXXFLAGS/g' \
+		-e '/ldconfig/d' \
+		"${S}"/Makefile.LINUX \
+		|| die "sed Makefile failed"
+}
+
+src_compile() {
+	emake -j1 LIBEXT=$(get_libdir) || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README FORMAT || die "dodoc failed"
+}