gentoo resync : 25.11.2020

3 files changed, 69 insertions, 22 deletions

diff --git a/sci-astronomy/galaxy/Manifest b/sci-astronomy/galaxy/Manifest
index 0a67e45b2e9e..5e82c3cd36d4 100644
--- a/sci-astronomy/galaxy/Manifest
+++ b/sci-astronomy/galaxy/Manifest
@@ -1,3 +1,4 @@
+AUX galaxy-2.2-makefile.patch 1894 BLAKE2B c65e78e4e84040e968903986063c065e269cc7dba5a9f2f221866aec94542ab4f138eac14699609aaa9189e5366c320e3239a7bccba11141d9c4d970f336cbf8 SHA512 0916eed7fbc788f0c320141628069b52ca868410d3bec35e0b7ac4f0bacf606c22f678c6d72a8e113d193b67373e73ffb98e51341b6b40f415803cc6323d992e
 DIST galaxy-2.2.tar.gz 146675 BLAKE2B 5e0dce355c7df5c73d3017b80f88715056cd8ceb765f7ad2810037fe8c800599979dbf3d42dbacdc70aafa080ad84a08db0d6d4cffc8ee4b86b8199e6b4e31f8 SHA512 b3843f4ef7bdd60d761db019ded8af99b4c520ecc1c852a210bc6282751474254d9b9172e738015c7b01df57502655749051baac11448797fb9b71ecd4edd8d6
-EBUILD galaxy-2.2-r1.ebuild 875 BLAKE2B 5a2e47bff63488456b5ed7e81182ada4797d638b6fae0e703b0b090d30c5ee20512e6e1cf1710d009b3f4c37d84a87c4c84f63b9e6187249e92029b7af7543c2 SHA512 95d3b81d7c47ab879570bc674d163f1da62c616bcd6e1a68df371125cdca72cb269ad83fa6957e516f3cc3c49e5766e183034d4bb0d4e1e1e361a0b9ccdd81a1
+EBUILD galaxy-2.2-r1.ebuild 672 BLAKE2B c46ad7cffe2d69bb1f99c5b8c41cb642f770292b4b0c5f5d2923ce7663beee343600b137bb7bff0aabdd05d71ade7c65df9f78141fe852c059bf2c70c379f559 SHA512 36468bf4dc8c1e775b2a769d6a5d49df95922bdacea8d140b093d39f1239309c61066304f8674ee325d6c9e378390911c4ce6177a9b5a0399a22e5841dfb1e53
 MISC metadata.xml 495 BLAKE2B a98e05ee1ab15cbd4e775f70482983f7a1be2ae4de2c7d70f0b74d92680ff5edbd677c22d252ba49d02e48140bf1c4b0ba7f0e2efe392e057c08472722f116b8 SHA512 22678d32e65d5d5379e2a4fb190fe0ea0249bd0cd4e85d07255e05d04c6b4d868810e0ee420f3cd842e4ebfdae960b8ead5624ff6d51f0dcd3e7c4897b5b3c07
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 000000000000..86d1e3a7bc2a
--- /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 bce80f743988..88341dfa0584 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
 }