diff options
author | Justin Lecher <jlec@gentoo.org> | 2015-08-03 07:07:04 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2015-08-03 07:07:04 +0000 |
commit | 134f73f81c3d2ca8b6b2f8661188244781031894 (patch) | |
tree | c7d6a0818ffbe2d094465203685912064a6bccfe /sci-libs | |
parent | Drop old (diff) | |
download | gentoo-2-134f73f81c3d2ca8b6b2f8661188244781031894.tar.gz gentoo-2-134f73f81c3d2ca8b6b2f8661188244781031894.tar.bz2 gentoo-2-134f73f81c3d2ca8b6b2f8661188244781031894.zip |
Drop old
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Diffstat (limited to 'sci-libs')
-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/files/liborigin-20100420-build-parsers.patch | 26 | ||||
-rw-r--r-- | sci-libs/liborigin/files/liborigin-20100420-gcc45.patch | 15 | ||||
-rw-r--r-- | sci-libs/liborigin/files/liborigin-20100630-gcc45.patch | 13 | ||||
-rw-r--r-- | sci-libs/liborigin/liborigin-20100903.ebuild | 57 |
6 files changed, 8 insertions, 159 deletions
diff --git a/sci-libs/liborigin/ChangeLog b/sci-libs/liborigin/ChangeLog index 99c7072fbf99..3d9ee8370e9c 100644 --- a/sci-libs/liborigin/ChangeLog +++ b/sci-libs/liborigin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-libs/liborigin # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.36 2015/08/02 18:52:07 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.37 2015/08/03 07:07:04 jlec Exp $ + + 03 Aug 2015; Justin Lecher <jlec@gentoo.org> + -files/liborigin-20080225-makefile.patch, + -files/liborigin-20100420-build-parsers.patch, + -files/liborigin-20100420-gcc45.patch, -files/liborigin-20100630-gcc45.patch, + -liborigin-20100903.ebuild: + Drop old 02 Aug 2015; Agostino Sarubbo <ago@gentoo.org> liborigin-20110829.ebuild: Stable for x86, wrt bug #553132 diff --git a/sci-libs/liborigin/files/liborigin-20080225-makefile.patch b/sci-libs/liborigin/files/liborigin-20080225-makefile.patch deleted file mode 100644 index f9efab256527..000000000000 --- a/sci-libs/liborigin/files/liborigin-20080225-makefile.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- 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/files/liborigin-20100420-build-parsers.patch b/sci-libs/liborigin/files/liborigin-20100420-build-parsers.patch deleted file mode 100644 index 91527af9e95d..000000000000 --- a/sci-libs/liborigin/files/liborigin-20100420-build-parsers.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: liborigin.pro -=================================================================== ---- liborigin.pro (revision 1751) -+++ liborigin.pro (working copy) -@@ -17,10 +17,20 @@ - HEADERS += OriginFile.h
- HEADERS += OriginParser.h
- HEADERS += OriginDefaultParser.h
--HEADERS += Origin750Parser.h
-+SOURCES += Origin600Parser.h
-+SOURCES += Origin610Parser.h
-+SOURCES += Origin700Parser.h
-+SOURCES += Origin750Parser.h
-+SOURCES += Origin800Parser.h
-+SOURCES += Origin810Parser.h
-
- SOURCES += OriginFile.cpp
- SOURCES += OriginParser.cpp
- SOURCES += OriginDefaultParser.cpp
-+SOURCES += Origin600Parser.cpp
-+SOURCES += Origin610Parser.cpp
-+SOURCES += Origin700Parser.cpp
- SOURCES += Origin750Parser.cpp
-+SOURCES += Origin800Parser.cpp
-+SOURCES += Origin810Parser.cpp
-
diff --git a/sci-libs/liborigin/files/liborigin-20100420-gcc45.patch b/sci-libs/liborigin/files/liborigin-20100420-gcc45.patch deleted file mode 100644 index 8aab51902793..000000000000 --- a/sci-libs/liborigin/files/liborigin-20100420-gcc45.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fixing build with gcc 4.5 - -http://bugs.gentoo.org/show_bug.cgi?id=318575 - ---- OriginDefaultParser.cpp -+++ OriginDefaultParser.cpp -@@ -73,7 +73,7 @@ - int i; - FILE *f, *debug; - if((f=fopen(fileName.c_str(),"rb")) == NULL ) { -- printf("Could not open %s!\n",fileName); -+ printf("Could not open %s!\n",fileName.c_str()); - return false; - } - diff --git a/sci-libs/liborigin/files/liborigin-20100630-gcc45.patch b/sci-libs/liborigin/files/liborigin-20100630-gcc45.patch deleted file mode 100644 index be63b7f2ce39..000000000000 --- a/sci-libs/liborigin/files/liborigin-20100630-gcc45.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: OriginDefaultParser.cpp -=================================================================== ---- OriginDefaultParser.cpp (revision 1751) -+++ OriginDefaultParser.cpp (working copy) -@@ -73,7 +73,7 @@ - int i; - FILE *f, *debug; - if((f=fopen(fileName.c_str(),"rb")) == NULL ) { -- printf("Could not open %s!\n",fileName); -+ printf("Could not open %s!\n",fileName.c_str()); - return false; - } - diff --git a/sci-libs/liborigin/liborigin-20100903.ebuild b/sci-libs/liborigin/liborigin-20100903.ebuild deleted file mode 100644 index 98845d23c9c5..000000000000 --- a/sci-libs/liborigin/liborigin-20100903.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20100903.ebuild,v 1.6 2013/03/02 23:23:00 hwoarang Exp $ - -EAPI="3" - -inherit eutils qt4-r2 - -DESCRIPTION="Library for reading OriginLab OPJ project files" -HOMEPAGE="http://soft.proindependent.com/liborigin2/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="2" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="doc" - -RDEPEND="dev-libs/boost" -DEPEND="${RDEPEND} - dev-qt/qtgui:4 - dev-cpp/tree - doc? ( app-doc/doxygen )" - -PATCHES=( - "${FILESDIR}/liborigin-20100420-build-parsers.patch" - ) - -DOCS="readme FORMAT" - -src_prepare() { - qt4-r2_src_prepare - cat >> liborigin.pro <<-EOF - INCLUDEPATH += "${EPREFIX}/usr/include/tree" - headers.files = \$\$HEADERS - headers.path = "${EPREFIX}/usr/include/liborigin2" - target.path = "${EPREFIX}/usr/$(get_libdir)" - INSTALLS = target headers - EOF - # use system one - rm -f tree.hh || die -} - -src_compile() { - qt4-r2_src_compile - if use doc; then - cd doc - doxygen Doxyfile || die "doc generation failed" - fi -} - -src_install() { - qt4-r2_src_install - if use doc; then - insinto /usr/share/doc/${PF} - doins -r doc/html || die "doc install failed" - fi -} |