| 1 |
commit: 2208c961af83de9a8759c633d2ce56cb54707d00 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 3 20:56:56 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 3 20:56:56 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2208c961 |
| 7 |
|
| 8 |
sci-astronomy/galaxy: Port to EAPI 7 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/741052 |
| 11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
.../galaxy/files/galaxy-2.2-makefile.patch | 61 ++++++++++++++++++++++ |
| 15 |
sci-astronomy/galaxy/galaxy-2.2-r1.ebuild | 27 +++------- |
| 16 |
2 files changed, 67 insertions(+), 21 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-astronomy/galaxy/files/galaxy-2.2-makefile.patch b/sci-astronomy/galaxy/files/galaxy-2.2-makefile.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..86d1e3a7bc2 |
| 21 |
--- /dev/null |
| 22 |
+++ b/sci-astronomy/galaxy/files/galaxy-2.2-makefile.patch |
| 23 |
@@ -0,0 +1,61 @@ |
| 24 |
+--- a/Makefile |
| 25 |
++++ b/Makefile |
| 26 |
+@@ -5,30 +5,28 @@ |
| 27 |
+ SOURCE = $(PROGRAM)-$(VERSION).cc |
| 28 |
+ |
| 29 |
+ # defaults for parameters that may be pre-defined |
| 30 |
+-CXXFLAGS ?= -O3 -g -Wall |
| 31 |
+-LDFLAGS ?= -O3 -g -Wall -rdynamic |
| 32 |
+-PREFIX ?= /usr |
| 33 |
++PREFIX = $(EPREFIX)/usr |
| 34 |
+ |
| 35 |
+ # target install directories |
| 36 |
+ BINDIR = $(PREFIX)/bin |
| 37 |
+ SHAREDIR = $(PREFIX)/share/$(PROGRAM) |
| 38 |
+ DATADIR = $(SHAREDIR)/data |
| 39 |
+ ICONDIR = $(SHAREDIR)/icons |
| 40 |
+-DOCDIR = $(PREFIX)/share/doc/$(PROGRAM) |
| 41 |
++DOCDIR = $(PREFIX)/share/doc/$(PF) |
| 42 |
+ MANDIR = $(PREFIX)/share/man/man1 |
| 43 |
+ MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop |
| 44 |
+ |
| 45 |
+-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0` |
| 46 |
+-LIBS = `pkg-config --libs gtk+-3.0` |
| 47 |
++CXXFLAGS += $(shell $(PKG_CONFIG) --cflags gtk+-3.0) |
| 48 |
++LIBS += $(shell $(PKG_CONFIG) --libs gtk+-3.0) |
| 49 |
+ |
| 50 |
+ $(PROGRAM): $(PROGRAM).o zfuncs.o |
| 51 |
+- $(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM) |
| 52 |
++ $(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o -o $(PROGRAM) $(LIBS) |
| 53 |
+ |
| 54 |
+ $(PROGRAM).o: $(SOURCE) |
| 55 |
+- $(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE) |
| 56 |
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $(PROGRAM).o $(SOURCE) |
| 57 |
+ |
| 58 |
+ zfuncs.o: zfuncs.cc zfuncs.h |
| 59 |
+- $(CXX) $(CFLAGS) zfuncs.cc \ |
| 60 |
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c zfuncs.cc \ |
| 61 |
+ -D PREFIX=\"$(PREFIX)\" -D DOCDIR=\"$(DOCDIR)\" \ |
| 62 |
+ -Wno-deprecated-declarations |
| 63 |
+ |
| 64 |
+@@ -45,19 +43,16 @@ |
| 65 |
+ cp -f -R doc/* $(DESTDIR)$(DOCDIR) |
| 66 |
+ # man page |
| 67 |
+ cp -f doc/$(PROGRAM).man $(PROGRAM).1 |
| 68 |
+- gzip -f -9 $(PROGRAM).1 |
| 69 |
+- cp $(PROGRAM).1.gz $(DESTDIR)$(MANDIR) |
| 70 |
++ cp $(PROGRAM).1 $(DESTDIR)$(MANDIR) |
| 71 |
+ rm -f $(PROGRAM).1.gz |
| 72 |
+ # menu (desktop) file |
| 73 |
+ cp -f desktop $(DESTDIR)$(MENUFILE) |
| 74 |
+- xdg-desktop-menu install $(DESTDIR)$(MENUFILE) |
| 75 |
+ |
| 76 |
+ uninstall: |
| 77 |
+ rm -f $(DESTDIR)$(BINDIR)/$(PROGRAM) |
| 78 |
+ rm -R -f $(DESTDIR)$(SHAREDIR) |
| 79 |
+ rm -R -f $(DESTDIR)$(DOCDIR) |
| 80 |
+ rm -f $(DESTDIR)$(MANDIR)/$(PROGRAM).1.gz |
| 81 |
+- xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE) |
| 82 |
+ rm -f $(DESTDIR)$(MENUFILE) |
| 83 |
+ |
| 84 |
+ clean: |
| 85 |
|
| 86 |
diff --git a/sci-astronomy/galaxy/galaxy-2.2-r1.ebuild b/sci-astronomy/galaxy/galaxy-2.2-r1.ebuild |
| 87 |
index bce80f74398..88341dfa058 100644 |
| 88 |
--- a/sci-astronomy/galaxy/galaxy-2.2-r1.ebuild |
| 89 |
+++ b/sci-astronomy/galaxy/galaxy-2.2-r1.ebuild |
| 90 |
@@ -1,9 +1,9 @@ |
| 91 |
-# Copyright 1999-2016 Gentoo Foundation |
| 92 |
+# Copyright 1999-2020 Gentoo Authors |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
|
| 95 |
-EAPI=6 |
| 96 |
+EAPI=7 |
| 97 |
|
| 98 |
-inherit fdo-mime flag-o-matic toolchain-funcs |
| 99 |
+inherit flag-o-matic toolchain-funcs xdg |
| 100 |
|
| 101 |
# probably change every release |
| 102 |
PID="1/3/0/3/13035936" |
| 103 |
@@ -15,31 +15,16 @@ SRC_URI="http://www.kornelix.com/uploads/${PID}/${P}.tar.gz" |
| 104 |
LICENSE="GPL-3" |
| 105 |
SLOT="0" |
| 106 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 107 |
-IUSE="" |
| 108 |
|
| 109 |
DEPEND="x11-libs/gtk+:3" |
| 110 |
RDEPEND="${DEPEND} |
| 111 |
x11-misc/xdg-utils" |
| 112 |
+BDEPEND="virtual/pkgconfig" |
| 113 |
|
| 114 |
-src_prepare() { |
| 115 |
- default |
| 116 |
- sed -e '/DOCDIR/ s/PROGRAM)/&-\$(VERSION)/g' \ |
| 117 |
- -e '/xdg-desktop-menu/d' \ |
| 118 |
- -i Makefile || die |
| 119 |
-} |
| 120 |
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) |
| 121 |
|
| 122 |
src_configure() { |
| 123 |
- tc-export CXX |
| 124 |
+ tc-export CXX PKG_CONFIG |
| 125 |
append-cxxflags -pthread |
| 126 |
append-ldflags -pthread |
| 127 |
- export PREFIX="${EPREFIX}/usr" |
| 128 |
- default |
| 129 |
-} |
| 130 |
- |
| 131 |
-pkg_postinst() { |
| 132 |
- fdo-mime_desktop_database_update |
| 133 |
-} |
| 134 |
- |
| 135 |
-pkg_postrm() { |
| 136 |
- fdo-mime_desktop_database_update |
| 137 |
} |
Archives