commit: 2208c961af83de9a8759c633d2ce56cb54707d00 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Oct 3 20:56:56 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Oct 3 20:56:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2208c961
sci-astronomy/galaxy: Port to EAPI 7 Closes: https://bugs.gentoo.org/741052 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: David Seifert <soap <AT> gentoo.org> .../galaxy/files/galaxy-2.2-makefile.patch | 61 ++++++++++++++++++++++ sci-astronomy/galaxy/galaxy-2.2-r1.ebuild | 27 +++------- 2 files changed, 67 insertions(+), 21 deletions(-) diff --git a/sci-astronomy/galaxy/files/galaxy-2.2-makefile.patch b/sci-astronomy/galaxy/files/galaxy-2.2-makefile.patch new file mode 100644 index 00000000000..86d1e3a7bc2 --- /dev/null +++ b/sci-astronomy/galaxy/files/galaxy-2.2-makefile.patch @@ -0,0 +1,61 @@ +--- a/Makefile ++++ b/Makefile +@@ -5,30 +5,28 @@ + SOURCE = $(PROGRAM)-$(VERSION).cc + + # defaults for parameters that may be pre-defined +-CXXFLAGS ?= -O3 -g -Wall +-LDFLAGS ?= -O3 -g -Wall -rdynamic +-PREFIX ?= /usr ++PREFIX = $(EPREFIX)/usr + + # target install directories + BINDIR = $(PREFIX)/bin + SHAREDIR = $(PREFIX)/share/$(PROGRAM) + DATADIR = $(SHAREDIR)/data + ICONDIR = $(SHAREDIR)/icons +-DOCDIR = $(PREFIX)/share/doc/$(PROGRAM) ++DOCDIR = $(PREFIX)/share/doc/$(PF) + MANDIR = $(PREFIX)/share/man/man1 + MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop + +-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0` +-LIBS = `pkg-config --libs gtk+-3.0` ++CXXFLAGS += $(shell $(PKG_CONFIG) --cflags gtk+-3.0) ++LIBS += $(shell $(PKG_CONFIG) --libs gtk+-3.0) + + $(PROGRAM): $(PROGRAM).o zfuncs.o +- $(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM) ++ $(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o -o $(PROGRAM) $(LIBS) + + $(PROGRAM).o: $(SOURCE) +- $(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $(PROGRAM).o $(SOURCE) + + zfuncs.o: zfuncs.cc zfuncs.h +- $(CXX) $(CFLAGS) zfuncs.cc \ ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c zfuncs.cc \ + -D PREFIX=\"$(PREFIX)\" -D DOCDIR=\"$(DOCDIR)\" \ + -Wno-deprecated-declarations + +@@ -45,19 +43,16 @@ + cp -f -R doc/* $(DESTDIR)$(DOCDIR) + # man page + cp -f doc/$(PROGRAM).man $(PROGRAM).1 +- gzip -f -9 $(PROGRAM).1 +- cp $(PROGRAM).1.gz $(DESTDIR)$(MANDIR) ++ cp $(PROGRAM).1 $(DESTDIR)$(MANDIR) + rm -f $(PROGRAM).1.gz + # menu (desktop) file + cp -f desktop $(DESTDIR)$(MENUFILE) +- xdg-desktop-menu install $(DESTDIR)$(MENUFILE) + + uninstall: + rm -f $(DESTDIR)$(BINDIR)/$(PROGRAM) + rm -R -f $(DESTDIR)$(SHAREDIR) + rm -R -f $(DESTDIR)$(DOCDIR) + rm -f $(DESTDIR)$(MANDIR)/$(PROGRAM).1.gz +- xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE) + rm -f $(DESTDIR)$(MENUFILE) + + clean: diff --git a/sci-astronomy/galaxy/galaxy-2.2-r1.ebuild b/sci-astronomy/galaxy/galaxy-2.2-r1.ebuild index bce80f74398..88341dfa058 100644 --- a/sci-astronomy/galaxy/galaxy-2.2-r1.ebuild +++ b/sci-astronomy/galaxy/galaxy-2.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit fdo-mime flag-o-matic toolchain-funcs +inherit flag-o-matic toolchain-funcs xdg # probably change every release PID="1/3/0/3/13035936" @@ -15,31 +15,16 @@ SRC_URI="http://www.kornelix.com/uploads/${PID}/${P}.tar.gz"; LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" DEPEND="x11-libs/gtk+:3" RDEPEND="${DEPEND} x11-misc/xdg-utils" +BDEPEND="virtual/pkgconfig" -src_prepare() { - default - sed -e '/DOCDIR/ s/PROGRAM)/&-\$(VERSION)/g' \ - -e '/xdg-desktop-menu/d' \ - -i Makefile || die -} +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) src_configure() { - tc-export CXX + tc-export CXX PKG_CONFIG append-cxxflags -pthread append-ldflags -pthread - export PREFIX="${EPREFIX}/usr" - default -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update }
