diff options
| -rw-r--r-- | sci-libs/liborigin/ChangeLog | 9 | ||||
| -rw-r--r-- | sci-libs/liborigin/files/liborigin-20080225-makefile.patch | 47 | ||||
| -rw-r--r-- | sci-libs/liborigin/liborigin-20080225-r1.ebuild | 33 | ||||
| -rw-r--r-- | sci-libs/liborigin/liborigin-20080225.ebuild | 43 |
4 files changed, 88 insertions, 44 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/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" -} |