Bunch of QA fixes, removed tree.hh now in main tree

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

5 files changed, 91 insertions, 56 deletions

diff --git a/sci-libs/liborigin/ChangeLog b/sci-libs/liborigin/ChangeLog
index 7cb0260e83b1..0f1648113bda 100644
--- a/sci-libs/liborigin/ChangeLog
+++ b/sci-libs/liborigin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/liborigin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.13 2009/04/14 11:27:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.14 2009/04/16 17:39:58 bicatali Exp $
+
+*liborigin-20080225-r1 (16 Apr 2009)
+
+  16 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/liborigin-20080225-makefile.patch, -liborigin-20080225.ebuild,
+  +liborigin-20080225-r1.ebuild:
+  Bunch of QA fixes, removed tree.hh now in main tree
 
 *liborigin-20090406 (14 Apr 2009)
 
diff --git a/sci-libs/liborigin/Manifest b/sci-libs/liborigin/Manifest
index 33842e96e4ea..c2d86e180248 100644
--- a/sci-libs/liborigin/Manifest
+++ b/sci-libs/liborigin/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX liborigin-20080225-makefile.patch 1547 RMD160 e1ce040963f3efd852190b3f7bf3ed363ddad214 SHA1 16fedf0df0efd79337463e54a1257b0cb19f706c SHA256 cc5b0f3517092e02f0aa2233c466e31fef172f07b152ccd3e2ceaf0df36b35d4
 DIST liborigin-20080225.tar.gz 49326 RMD160 c18339fee71b2b819c95c54f0dfea4a49e44f522 SHA1 0dbbd2f929beaf94600c055fc3b15228354498c2 SHA256 bfa1d8ea617df9ad0c9e3764eefb0c7dc8ba76478735607e6cdd01df9937835e
 DIST liborigin2-06042009.zip 739957 RMD160 86a48dc031eb7b3fe5d162901ed07ead6e805a13 SHA1 1763568726bc446bab018946ebd023f5a2ca6fe7 SHA256 53f2638f7ef96cf09fb01ba47c8d7d70739e70620a7a60ce2b28f7a270c9e55c
-EBUILD liborigin-20080225.ebuild 1137 RMD160 ba4a1f538a5a28e559b9c0c6674eba989378d460 SHA1 3f25f3ba8e5cfb179549c8cbeb7bfc05cbc72f00 SHA256 50877364efa1274313daeb7bb3dabab90c65292938067f1df1fab5b664a274fb
+EBUILD liborigin-20080225-r1.ebuild 781 RMD160 478651ee97cffc3c66e1e4e1e9deaf367798f839 SHA1 4d89b15067e49b8f858dd0a90e89e29c67d17b20 SHA256 4c015733505b205244e284ebc023457075ee2c667d6ca0828ededa311a49b944
 EBUILD liborigin-20090406.ebuild 1306 RMD160 95389971cf5d13b8628c583e38e6e3ce9f6805ab SHA1 1143c130bad44d4168271e14c0966dbcfafefb30 SHA256 3ba38f0a42f6abad5fd8a4f43fd3fae5e4a0c8d380c718b85587ab5650ab4b21
-MISC ChangeLog 2196 RMD160 ba691c790050c2d3fa3345d17f555e9135407d36 SHA1 9fc0e310b364aee69e358912c7585c6f478b6159 SHA256 ce1364d4adc71f43b1ae48e350d1c559554c7110f648970e1906e48f34b2a941
+MISC ChangeLog 2449 RMD160 46fee0173b97f71815f43486d5fe90cdbc0c92f9 SHA1 a9cf464d564b6b8e48f711aed0f65ddf24134b39 SHA256 d9f58a48b3222dfd736c3662375cde79fdbcac7b241d27621240ba27d70d704b
 MISC metadata.xml 253 RMD160 6f6629a29e3d78392dc866988d84e1181f4393b4 SHA1 8eec277c384cc4ab1e293172028c71ca164af7a4 SHA256 ade43daac692ebcd9187e8c0ec18331a14f189a686a3c9c52c1016a3e7f98ba0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAknkc0MACgkQ1ycZbhPLE2CaGgCggfdwrKkcTWsJ8ZhU/5i2Krkg
-7NYAnRskZoywExt4E5yGQuOW9spIjfVs
-=rhnS
------END PGP SIGNATURE-----
diff --git a/sci-libs/liborigin/files/liborigin-20080225-makefile.patch b/sci-libs/liborigin/files/liborigin-20080225-makefile.patch
new file mode 100644
index 000000000000..f9efab256527
--- /dev/null
+++ b/sci-libs/liborigin/files/liborigin-20080225-makefile.patch
@@ -0,0 +1,47 @@
+--- Makefile.LINUX.orig	2008-02-25 10:20:26.000000000 +0000
++++ Makefile.LINUX	2009-04-16 18:36:21.634506850 +0100
+@@ -5,15 +5,14 @@
+ TARGET3	= $(TARGET0).0.0.4
+ OPJ     = OPJFile
+ OPJ2DAT = opj2dat
+-CC	= g++
+-CFLAGS	= -pipe -Wall -W -O2 -fPIC
+-LDFLAGS	= -shared -Wl,-soname,$(TARGET1)
++MYCXXFLAGS = -pipe -Wall -W -fPIC
++MYLDFLAGS = -shared -Wl,-soname,$(TARGET1)
+ LIBEXT  = `./lib-arch.sh`
+ all : $(TARGET0) $(OPJ2DAT)
+ 
+ $(TARGET0) : $(OPJ).cpp $(OPJ).h
+-	$(CC) -c $(CFLAGS) $(OPJ).cpp -o $(OPJ).o
+-	$(CC) $(LDFLAGS) -o $(TARGET3) $(OPJ).o
++	$(CXX) -c $(CXXFLAGS) $(MYCXXFLAGS) $(OPJ).cpp -o $(OPJ).o
++	$(CXX) $(LDFLAGS) $(MYLDFLAGS) $(OPJ).o -o $(TARGET3) 
+ 	mkdir -p lib
+ 	chmod 644 $(TARGET3)
+ 	mv -f $(TARGET3) lib/
+@@ -22,8 +21,9 @@
+ 	ln -sf $(TARGET3) $(TARGET1);\
+ 	ln -sf $(TARGET3) $(TARGET2))
+ 
+-$(OPJ2DAT): $(OPJ2DAT).cpp 
+-	$(CC) $(CFLAGS) -L lib/ -o $(OPJ2DAT) -lorigin $(OPJ2DAT).cpp
++$(OPJ2DAT): $(OPJ2DAT).cpp
++	$(CXX) -c $(CXXFLAGS) $(MYCXXFLAGS) $(OPJ2DAT).cpp -o $(OPJ2DAT).o
++	$(CXX) $(LDFLAGS) $(MYLDFLAGS) $(OPJ2DAT).o -Llib -lorigin -o $(OPJ2DAT)
+ 
+ clean :
+ 	rm -f *~ *.o $(OPJ2DAT) $(TARGET0)*
+@@ -36,9 +36,9 @@
+ 	chmod 755 $(OPJ2DAT)
+ 	cp $(OPJ2DAT) $(DESTDIR)/usr/bin
+ 	mkdir -p $(DESTDIR)/usr/include/$(TARGET)
+-	chmod 644 $(OPJ).h tree.hh
+-	cp $(OPJ).h tree.hh $(DESTDIR)/usr/include/$(TARGET)
+-	ldconfig
++	chmod 644 $(OPJ).h
++	cp $(OPJ).h $(DESTDIR)/usr/include/$(TARGET)
++
+ uninstall:
+ 	rm -f $(DESTDIR)/usr/$(LIBEXT)/$(TARGET0)* $(DESTDIR)/usr/bin/$(OPJ2DAT) $(DESTDIR)/usr/include/$(TARGET)/$(OPJ).h
+ 	ldconfig
diff --git a/sci-libs/liborigin/liborigin-20080225-r1.ebuild b/sci-libs/liborigin/liborigin-20080225-r1.ebuild
new file mode 100644
index 000000000000..fbee6fe440d1
--- /dev/null
+++ b/sci-libs/liborigin/liborigin-20080225-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20080225-r1.ebuild,v 1.1 2009/04/16 17:39:58 bicatali Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="A library for reading OriginLab OPJ project files"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://sourceforge.net/projects/liborigin/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-cpp/tree"
+RDEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	rm tree.hh || die
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README FORMAT || die "dodoc failed"
+}
diff --git a/sci-libs/liborigin/liborigin-20080225.ebuild b/sci-libs/liborigin/liborigin-20080225.ebuild
deleted file mode 100644
index 8f160960bf56..000000000000
--- a/sci-libs/liborigin/liborigin-20080225.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20080225.ebuild,v 1.2 2008/03/15 10:02:45 corsair Exp $
-
-inherit multilib
-
-DESCRIPTION="A library for reading OriginLab OPJ project files"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://sourceforge.net/projects/liborigin/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-SLOT="0"
-IUSE=""
-
-DEPEND="!<sci-visualization/labplot-1.5.1.6"
-RESTRICT="test"
-
-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' \
-		-e "s/mkdir -p lib/mkdir -p $(get_libdir)/g" \
-		-e "s/\`.\/lib-arch.sh\`/$(get_libdir)/g" \
-		-e "s/lib\//$(get_libdir)\//g" \
-		"${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"
-}