Version bump.

Package-Manager: portage-2.1.3.9

6 files changed, 69 insertions, 62 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/Manifest b/sci-libs/liborigin/Manifest
index cc838630bbb7..966f1b98da9c 100644
--- a/sci-libs/liborigin/Manifest
+++ b/sci-libs/liborigin/Manifest
@@ -1,34 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST liborigin-20070115.tgz 20308 RMD160 6531fb562e390a4a9afc64f56af78ce7b8316e10 SHA1 9a925b151692cf62987626633f312f47ddb6f5e6 SHA256 125de16ffc055102bd0aaf31de71ad5daeefc962aea97723b75611800f9ecd38
+DIST liborigin-2007-08-21.tar.gz 45977 RMD160 00fe891cc6b34aed41318821bbb01a709bc3fbb8 SHA1 22b286d7b6f392cbf7d24ba41b6376730d5681af SHA256 7efe0fcbddc44c5d66b34ebb9bad6662864b919ba5b3ee166c991f554fc179f9
 DIST liborigin-20070529.tar.gz 29402 RMD160 96b4a60691ed322bbdada80d8ed81ce83ae4d4d7 SHA1 4134a2de15892692df82de5395265d755eadedb8 SHA256 b84f0afa3a24798be3a358fe5aaa9ba50d2eec1a02aff69bda7a9f138fad9277
-EBUILD liborigin-20070115.ebuild 1312 RMD160 5de5a30205be48029839deafa9895c3d91ab7bb7 SHA1 1592ffae51f84129a53a57a3d7c48f9640fa5725 SHA256 3082dfab3d11e0895333127bbc6ae4b23297418acde3ab7da9e8918777ef8df5
-MD5 8e4b442b690816e49904f721e2c3e9c1 liborigin-20070115.ebuild 1312
-RMD160 5de5a30205be48029839deafa9895c3d91ab7bb7 liborigin-20070115.ebuild 1312
-SHA256 3082dfab3d11e0895333127bbc6ae4b23297418acde3ab7da9e8918777ef8df5 liborigin-20070115.ebuild 1312
 EBUILD liborigin-20070529.ebuild 1340 RMD160 3975393617df6216cb810e678d9ae2a70f573d53 SHA1 d62fa888573162f788294d9a3e59cde0b467cd39 SHA256 9f84cd30d795c6ea527b0c54d712b39b6a269ffc22e34c922862c7c9dc2b467e
 MD5 e397293c5d665f3844bda0811d92a2df liborigin-20070529.ebuild 1340
 RMD160 3975393617df6216cb810e678d9ae2a70f573d53 liborigin-20070529.ebuild 1340
 SHA256 9f84cd30d795c6ea527b0c54d712b39b6a269ffc22e34c922862c7c9dc2b467e liborigin-20070529.ebuild 1340
-MISC ChangeLog 938 RMD160 bf6c211d02e2afa2397982286f4b5972b41d710d SHA1 3f310924946ec38f90f6fcf3d1723e13c91ecf6e SHA256 e801d6b5803dd675b86aaaf0a3051c2462e135e44d4d4c646aa86131c2915dd6
-MD5 2403e0e07982d8b0aefbcbee2c145200 ChangeLog 938
-RMD160 bf6c211d02e2afa2397982286f4b5972b41d710d ChangeLog 938
-SHA256 e801d6b5803dd675b86aaaf0a3051c2462e135e44d4d4c646aa86131c2915dd6 ChangeLog 938
+EBUILD liborigin-20070821.ebuild 1070 RMD160 de3dae3c9568ed079477f685ebaf1e0d1115530c SHA1 50a27829818c610988b23de49d2c21ca4624ece9 SHA256 668c4ccdc9bf59281a8a0a3ad0e44902a2f88b69e85dcebb2f155045e54e0736
+MD5 ad639ca044ca210ece17c592b3ad8b3a liborigin-20070821.ebuild 1070
+RMD160 de3dae3c9568ed079477f685ebaf1e0d1115530c liborigin-20070821.ebuild 1070
+SHA256 668c4ccdc9bf59281a8a0a3ad0e44902a2f88b69e85dcebb2f155045e54e0736 liborigin-20070821.ebuild 1070
+MISC ChangeLog 1103 RMD160 081292261e5065d374973e64608844e583e6c45a SHA1 48ff8e8616da2eb007b9db3051c3e642a0a586c2 SHA256 eeb2fad094093583cebbcd8a2781eab4acd82e990b0ee636d8592c720c26ef78
+MD5 db6d448a4f4a4c0c87faed526b99436e ChangeLog 1103
+RMD160 081292261e5065d374973e64608844e583e6c45a ChangeLog 1103
+SHA256 eeb2fad094093583cebbcd8a2781eab4acd82e990b0ee636d8592c720c26ef78 ChangeLog 1103
 MISC metadata.xml 253 RMD160 6f6629a29e3d78392dc866988d84e1181f4393b4 SHA1 8eec277c384cc4ab1e293172028c71ca164af7a4 SHA256 ade43daac692ebcd9187e8c0ec18331a14f189a686a3c9c52c1016a3e7f98ba0
 MD5 2080e1501bd2ad8e051bcdc0af429303 metadata.xml 253
 RMD160 6f6629a29e3d78392dc866988d84e1181f4393b4 metadata.xml 253
 SHA256 ade43daac692ebcd9187e8c0ec18331a14f189a686a3c9c52c1016a3e7f98ba0 metadata.xml 253
-MD5 48f68f740e3a34c23185e90b4e60a4a5 files/digest-liborigin-20070115 244
-RMD160 4ca812603d9f8807856817a3e7a0010ff34ed106 files/digest-liborigin-20070115 244
-SHA256 4ba016bc063b0096c7950bc55b5342ea79fd893ab4002896a693cb7df0c67e79 files/digest-liborigin-20070115 244
 MD5 f03bcf85e3811519b82cd6120798e6d3 files/digest-liborigin-20070529 253
 RMD160 dc3d38abf2dfaeaae8a80cb7f10c071be2c6013c files/digest-liborigin-20070529 253
 SHA256 37136cc4c16bd562b1f47e685c9703604d416fd74a3ce5f0c55560248e74b6e9 files/digest-liborigin-20070529 253
+MD5 eb2515a472a4f803f135b618a04e73ed files/digest-liborigin-20070821 259
+RMD160 aa0e0395180a15793c9fbd23b8294b00c54926f7 files/digest-liborigin-20070821 259
+SHA256 55fb4971f3259525ee132b5320e68a60e8e42b54fde3e2b912d7de74a45e5426 files/digest-liborigin-20070821 259
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGsMDn1ycZbhPLE2ARAgcUAJ9WjmwzCJuE+uJL0ycsV14S3omnpwCgoB3R
-kKaOV3RwEAFkL0RVTPpxAd0=
-=ChVx
+iD8DBQFG8pRE1ycZbhPLE2ARAnD8AJ4vZ9EgrtkIgUAnUAODOZthGcXoMQCeNPPU
+DNl9R4xX069OQns7DXtN2RQ=
+=mJPG
 -----END PGP SIGNATURE-----
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"
+}