Version Bump

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 151 insertions, 1 deletions

diff --git a/sci-libs/cqrlib/ChangeLog b/sci-libs/cqrlib/ChangeLog
index 2ff6d1bd67ed..f91f942312e2 100644
--- a/sci-libs/cqrlib/ChangeLog
+++ b/sci-libs/cqrlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/cqrlib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cqrlib/ChangeLog,v 1.3 2010/03/07 18:49:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cqrlib/ChangeLog,v 1.4 2010/05/25 09:26:44 jlec Exp $
+
+*cqrlib-1.0.5 (25 May 2010)
+
+  25 May 2010; Justin Lecher <jlec@gentoo.org> +files/1.0.5-gentoo.patch,
+  +cqrlib-1.0.5.ebuild:
+  Version Bump
 
   07 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
   cqrlib-1.0.3-r1.ebuild:
diff --git a/sci-libs/cqrlib/cqrlib-1.0.5.ebuild b/sci-libs/cqrlib/cqrlib-1.0.5.ebuild
new file mode 100644
index 000000000000..d20de4aedaee
--- /dev/null
+++ b/sci-libs/cqrlib/cqrlib-1.0.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cqrlib/cqrlib-1.0.5.ebuild,v 1.1 2010/05/25 09:26:44 jlec Exp $
+
+EAPI="3"
+
+inherit base flag-o-matic multilib toolchain-funcs versionator
+
+MY_PN=CQRlib
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="An ANSI C implementation of a utility library for quaternion arithmetic and quaternion rotation math"
+HOMEPAGE="http://cqrlib.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/cvector"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-gentoo.patch
+	)
+
+src_compile() {
+	sed "s:GENTOOLIBDIR:$(get_libdir):g" -i Makefile || die
+	append-flags -ansi
+	emake \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		CFLAGS="${CFLAGS}" \
+		all || die
+}
+
+src_test() {
+	emake -j1 \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		CFLAGS="${CFLAGS}" \
+		tests || die
+}
+
+src_install() {
+	emake -j1 DESTDIR="${ED}" install || die
+
+	dodoc README_CQRlib.txt || die
+	dohtml README_CQRlib.html || die
+}
diff --git a/sci-libs/cqrlib/files/1.0.5-gentoo.patch b/sci-libs/cqrlib/files/1.0.5-gentoo.patch
new file mode 100644
index 000000000000..a5e7772e91ba
--- /dev/null
+++ b/sci-libs/cqrlib/files/1.0.5-gentoo.patch
@@ -0,0 +1,91 @@
+diff --git a/Makefile b/Makefile
+index ffd3114..cd9891d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -88,7 +88,7 @@ INCLUDES = -I$(INC)
+ endif
+ 
+ COMPILE_COMMAND         =  $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
+-LIBRARY_LINK_COMMAND    =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib
++LIBRARY_LINK_COMMAND    =  $(LIBTOOL) --mode=link $(CC) -shared -version-info $(VERSION) -rpath $(INSTALLDIR)/lib ${LDFLAGS}
+ BUILD_COMMAND_LOCAL     =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
+ BUILD_COMMAND_DYNAMIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -dynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
+ BUILD_COMMAND_STATIC    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
+@@ -194,54 +194,31 @@ default:
+ #
+ all:	$(LIB) $(BIN) $(SOURCE) $(HEADERS) \
+ 		$(LIB)/libCQRlib.$(LIB_EXT) \
+-		$(BIN)/CQRlibTest $(BIN)/CPPQRTest
+ 		
+-install:  all $(INSTALLDIR) $(INSTALLDIR)/lib $(INSTALLDIR)/include \
++install:  all $(DESTDIR) $(DESTDIR)/GENTOOLIBDIR $(DESTDIR)/include \
+           $(INC) $(LIB)/libCQRlib.$(LIB_EXT)  $(INC)/cqrlib.h
+-		  $(INSTALL_COMMAND) $(LIB)/libCQRlib.$(LIB_EXT) $(INSTALLDIR)/lib/libCQRlib.$(LIB_EXT)
+-		  $(INSTALL_FINISH_COMMAND) $(INSTALLDIR)/lib/libCQRlib.$(LIB_EXT)
+-		  -cp $(INSTALLDIR)/include/cqrlib.h $(INSTALLDIR)/include/CQRlib_old.h
+-		  cp $(INC)/cqrlib.h $(INSTALLDIR)/include/cqrlib.h
+-		  chmod 644 $(INSTALLDIR)/include/cqrlib.h
+-		  echo "Testing final install dynamic"
+-		  $(BUILD_COMMAND_DYNAMIC)  $(EXAMPLES)/CQRlibTest.c \
+-		  -lCQRlib -lm -o $(BIN)/CQRlibTest_dynamic
+-		  $(BIN)/CQRlibTest_dynamic > $(TESTDATA)/CQRlibTest_dynamic.lst
+-		  diff -b -c $(TESTDATA)/CQRlibTest_orig.lst \
+-		    $(TESTDATA)/CQRlibTest_dynamic.lst
+-		  echo "Testing final install static"
+-		  $(BUILD_COMMAND_STATIC) $(EXAMPLES)/CQRlibTest.c \
+-		   -lCQRlib -lm -o $(BIN)/CQRlibTest_static
+-		  $(BIN)/CQRlibTest_static > $(TESTDATA)/CQRlibTest_static.lst
+-		  diff -b -c $(TESTDATA)/CQRlibTest_orig.lst \
+-		    $(TESTDATA)/CQRlibTest_static.lst
+-		  $(CPPBUILD_COMMAND_DYNAMIC) $(EXAMPLES)/CPPQRTest.cpp \
+-		    -lm -o $(BIN)/CPPQRTest_dynamic
+-		  $(BIN)/CPPQRTest_dynamic > $(TESTDATA)/CPPQRTest_dynamic.lst
+-		  diff -b -c $(TESTDATA)/CPPQRTest_orig.lst \
+-		    $(TESTDATA)/CPPQRTest_dynamic.lst
+-		  $(CPPBUILD_COMMAND_STATIC) $(EXAMPLES)/CPPQRTest.cpp \
+-		    -lm -o $(BIN)/CPPQRTest_static
+-	      $(BIN)/CPPQRTest_static > $(TESTDATA)/CPPQRTest_static.lst
+-		  diff -b -c $(TESTDATA)/CPPQRTest_orig.lst \
+-		    $(TESTDATA)/CPPQRTest_static.lst
++		  $(INSTALL_COMMAND) $(LIB)/libCQRlib.$(LIB_EXT) $(DESTDIR)/usr/GENTOOLIBDIR/libCQRlib.$(LIB_EXT)
++		  $(INSTALL_FINISH_COMMAND) $(DESTDIR)/usr/GENTOOLIBDIR/libCQRlib.$(LIB_EXT)
++		  -cp $(INSTALLDIR)/cqrlib.h $(DESTDIR)/usr/include/CQRlib.h
++		  cp $(INC)/cqrlib.h $(DESTDIR)/usr/include/cqrlib.h
++		  chmod 644 $(DESTDIR)/usr/include/cqrlib.h
+ 			
+ 		  
+ 		  
+ #
+ # Directories
+ #
+-$(INSTALLDIR):
+-	mkdir -p $(INSTALLDIR)
++$(DESTDIR):
++	mkdir -p $(DESTDIR)
+ 
+-$(INSTALLDIR)/lib:  $(INSTALLDIR)
+-	mkdir -p $(INSTALLDIR)/lib
++$(DESTDIR)/GENTOOLIBDIR:  $(DESTDIR)
++	mkdir -p $(DESTDIR)/usr/GENTOOLIBDIR
+ 
+-$(INSTALLDIR)/bin:  $(INSTALLDIR)
+-	mkdir -p $(INSTALLDIR)/bin
++$(DESTDIR)/bin:  $(DESTDIR)
++	mkdir -p $(DESTDIR)/usr/bin
+ 
+-$(INSTALLDIR)/include:  $(INSTALLDIR)
+-	mkdir -p $(INSTALLDIR)/include
++$(DESTDIR)/include:  $(DESTDIR)
++	mkdir -p $(DESTDIR)/usr/include
+ 	
+ 
+ $(LIB):
+@@ -274,7 +251,7 @@ $(BIN)/CPPQRTest: $(EXAMPLES)/CPPQRTest.cpp
+ #
+ # Tests
+ #
+-tests:		$(LIB) $(BIN) $(BIN)/CQRlibTest \
++tests:		$(LIB) $(BIN) $(BIN)/CQRlibTest $(BIN)/CPPQRTest \
+ 				all $(TESTDATA)/CQRlibTest_orig.lst $(TESTDATA)/CPPQRTest_orig.lst
+ 			$(BIN)/CQRlibTest > $(TESTDATA)/CQRlibTest.lst
+ 			diff -b -c $(TESTDATA)/CQRlibTest_orig.lst \