* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gperiodic/, sci-chemistry/gperiodic/files/
@ 2020-06-30 9:27 Andreas Sturmlechner
0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2020-06-30 9:27 UTC (permalink / raw
To: gentoo-commits
commit: 88bccc096e61e4829d8d05aed0f5f42681c6e91f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 30 07:14:27 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 09:27:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88bccc09
sci-chemistry/gperiodic: Drop 2.0.10-r2 and 3.0.1
Closes: https://bugs.gentoo.org/707580
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-chemistry/gperiodic/Manifest | 2 -
.../files/gperiodic-2.0.10-makefile.patch | 64 ---------------------
.../gperiodic/files/gperiodic-2.0.10-nls.patch | 20 -------
.../gperiodic/files/gperiodic-3.0.1-makefile.patch | 66 ----------------------
.../gperiodic/files/gperiodic-3.0.1-nls.patch | 20 -------
sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild | 47 ---------------
sci-chemistry/gperiodic/gperiodic-3.0.1.ebuild | 53 -----------------
7 files changed, 272 deletions(-)
diff --git a/sci-chemistry/gperiodic/Manifest b/sci-chemistry/gperiodic/Manifest
index 41e5410baf6..0f1c1543edc 100644
--- a/sci-chemistry/gperiodic/Manifest
+++ b/sci-chemistry/gperiodic/Manifest
@@ -1,3 +1 @@
-DIST gperiodic-2.0.10.tar.gz 131213 BLAKE2B bd846dd64afa07e038008e6fe0563f5743767f3a1fba1aad0122ae644c7fb9279657609733bc4e6d4f4dcf988aff6096431ba1b71d02a328e01376ae00ff9bcb SHA512 23d0074ad5b0f9e25e8eee63f8c375e2448b1ee7c00f89e965b7dd8ce3f60f20251d7699a2f7a767228316144b946a5ac204a3e478c395767133f7fc801b51ba
-DIST gperiodic-3.0.1.tar.gz 375347 BLAKE2B fb10c7d3484e822e636a8aca245ab2a68a95cfebbb433df03a643a1155f300d2cdca49ddb5713d298c69a25123abbf72e17fdd51f69c9b031d05153937b283fc SHA512 3bf47359dda1a029f3528ea04d28cd75909bceb535f6e1dc6c90f5a17b668e0dd98900ddd83633649383ff4e2fc588265275e0e4a27897ecc4ac6db4e93befc1
DIST gperiodic-3.0.3.tar.gz 451559 BLAKE2B b91995046b9905a534e3b6f530aee0ad2b4e6ac42cd11755ea182fdaaf8970f34b1aea8a33870abb8767837606a42a0cf0d76c9a689236aa39fba686e1521ee8 SHA512 7226063cf7977f4283a199d4a3d1842d6c9be60c53f5a005541eb26f35cd6538b29f086dc13c28225779e1849a12d1c39150897055c03902cb00adc011bc1ce8
diff --git a/sci-chemistry/gperiodic/files/gperiodic-2.0.10-makefile.patch b/sci-chemistry/gperiodic/files/gperiodic-2.0.10-makefile.patch
deleted file mode 100644
index abdb5caae4f..00000000000
--- a/sci-chemistry/gperiodic/files/gperiodic-2.0.10-makefile.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Respect CC, CFLAGS, LDFLAGS
-Fix install paths
-Fix parallel build
-Drop DEPRECATED flags, bug #391099
-
---- Makefile
-+++ Makefile
-@@ -1,6 +1,5 @@
--CC := gcc
--CFLAGS := `pkg-config --cflags gtk+-2.0` -I. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
--LIBS :=`pkg-config --libs gtk+-2.0`
-+CFLAGS += `pkg-config --cflags gtk+-2.0` -I.
-+LIBS +=`pkg-config --libs gtk+-2.0`
- bindir ?= /usr/bin
- datadir ?= /usr/share
- enable_nls ?= 1
-@@ -8,12 +7,11 @@
- .c.o:
- $(CC) -c $(CFLAGS) $(CPPFLAGS) $<
-
--all:
-- make gperiodic
-- make -C po/ all enable_nls=$(enable_nls)
-+all: gperiodic
-+ $(MAKE) -C po/ all enable_nls=$(enable_nls)
-
- gperiodic: gperiodic.o
-- $(CC) $(CFLAGS) -o gperiodic gperiodic.o $(LIBS)
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o gperiodic gperiodic.o $(LIBS)
- ifeq ($(strip),1)
- strip gperiodic
- endif
-@@ -23,24 +21,21 @@
- gperiodic.o: gperiodic.c gperiodic.h table_data.h
-
- install:
-- mkdir -p $(DESTDIR)$(bindir)
-- install -m 755 gperiodic $(DESTDIR)$(bindir)
-- mkdir -p $(DESTDIR)$(datadir)/applications
-- install -m 644 gperiodic.desktop $(DESTDIR)$(datadir)/applications
-- mkdir -p $(DESTDIR)$(datadir)/pixmaps
-- install -m 644 gperiodic.png $(DESTDIR)$(datadir)/pixmaps
-- install -m 644 gperiodic-crystal.png $(DESTDIR)$(datadir)/pixmaps
-- make -C po/ install enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR)
-+ install -D -m 755 gperiodic $(DESTDIR)$(bindir)/gperiodic
-+ install -D -m 644 gperiodic.desktop $(DESTDIR)$(datadir)/applications/gperiodic.desktop
-+ install -D -m 644 gperiodic.png $(DESTDIR)$(datadir)/pixmaps/gperiodic.png
-+ install -m 644 gperiodic-crystal.png $(DESTDIR)$(datadir)/pixmaps/gperiodic-crystal.png
-+ $(MAKE) -C po/ install enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR)
-
- uninstall:
- rm -f $(bindir)/gperiodic \
- $(datadir)/applications/gperiodic.desktop
- $(datadir)/pixmaps/gperiodic.png \
- $(datadir)/pixmaps/gperiodic-crystal.png
-- make -C po/ uninstall enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR)
-+ $(MAKE) -C po/ uninstall enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR)
-
- clean:
- rm -f *.o gperiodic
-- make -C po/ clean
-+ $(MAKE) -C po/ clean
-
- .PHONY: install uninstall clean
diff --git a/sci-chemistry/gperiodic/files/gperiodic-2.0.10-nls.patch b/sci-chemistry/gperiodic/files/gperiodic-2.0.10-nls.patch
deleted file mode 100644
index de0bea04dc1..00000000000
--- a/sci-chemistry/gperiodic/files/gperiodic-2.0.10-nls.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- po/Makefile | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/po/Makefile b/po/Makefile
-index d7d7d78..179dad6 100644
---- a/po/Makefile
-+++ b/po/Makefile
-@@ -26,10 +26,12 @@ endif
-
- install:
- $(MAKE) all
-+ifeq ($(enable_nls),1)
- for f in $(FILES_MO) ; do \
- mkdir -p $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \
- install -m 644 $$f $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; \
- done
-+endif
-
- uninstall:
- for f in $(FILES_MO) ; do \
diff --git a/sci-chemistry/gperiodic/files/gperiodic-3.0.1-makefile.patch b/sci-chemistry/gperiodic/files/gperiodic-3.0.1-makefile.patch
deleted file mode 100644
index a7a402a1a78..00000000000
--- a/sci-chemistry/gperiodic/files/gperiodic-3.0.1-makefile.patch
+++ /dev/null
@@ -1,66 +0,0 @@
- Makefile | 36 ++++++++++++++----------------------
- 1 file changed, 14 insertions(+), 22 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 7e86dc4..9bd4fe8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -14,8 +14,8 @@ enable_nls ?= 1
- $(CC) -c $(CFLAGS) $(CPPFLAGS) $<
-
- all:
-- make gperiodic
-- make -C po/ all enable_nls=$(enable_nls)
-+ $(MAKE) gperiodic
-+ $(MAKE) -C po/ all enable_nls=$(enable_nls)
- intltool-merge -d po gperiodic.desktop.in gperiodic.desktop
-
- gperiodic: gperiodic.o
-@@ -29,24 +29,16 @@ gpdata.o: gpdata.c gperiodic.h
- gperiodic.o: gperiodic.c gperiodic.h table_data.h
-
- install:
-- mkdir -p $(DESTDIR)$(bindir)
-- install -m 755 gperiodic $(DESTDIR)$(bindir)
-- mkdir -p $(DESTDIR)$(datadir)/applications
-- install -m 644 gperiodic.desktop $(DESTDIR)$(datadir)/applications
-- mkdir -p $(DESTDIR)$(datadir)/pixmaps
-- install -m 644 icons/gperiodic.png $(DESTDIR)$(datadir)/pixmaps
-- install -m 644 icons/gperiodic.xpm $(DESTDIR)$(datadir)/pixmaps
-- mkdir -p $(DESTDIR)$(mandir)
-- install -m 644 gperiodic.1 $(DESTDIR)$(mandir)
-- mkdir -p $(DESTDIR)$(iconsdir)/hicolor/16x16/apps
-- mkdir -p $(DESTDIR)$(iconsdir)/hicolor/32x32/apps
-- mkdir -p $(DESTDIR)$(iconsdir)/hicolor/48x48/apps
-- mkdir -p $(DESTDIR)$(iconsdir)/hicolor/64x64/apps
-- install -m 644 icons/hicolor/16x16/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/16x16/apps
-- install -m 644 icons/hicolor/32x32/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/32x32/apps
-- install -m 644 icons/hicolor/48x48/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/48x48/apps
-- install -m 644 icons/hicolor/64x64/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/64x64/apps
-- make -C po/ install enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR)
-+ install -D -m 755 gperiodic $(DESTDIR)$(bindir)/gperiodic
-+ install -D -m 644 gperiodic.desktop $(DESTDIR)$(datadir)/applications/gperiodic.desktop
-+ install -D -m 644 icons/gperiodic.png $(DESTDIR)$(datadir)/pixmaps/gperiodic.png
-+ install -D -m 644 icons/gperiodic.xpm $(DESTDIR)$(datadir)/pixmaps/gperiodic.xpm
-+ install -D -m 644 gperiodic.1 $(DESTDIR)$(mandir)/gperiodic.1
-+ install -D -m 644 icons/hicolor/16x16/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/16x16/apps/gperiodic.png
-+ install -D -m 644 icons/hicolor/32x32/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/32x32/apps/gperiodic.png
-+ install -D -m 644 icons/hicolor/48x48/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/48x48/apps/gperiodic.png
-+ install -D -m 644 icons/hicolor/64x64/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/64x64/apps/gperiodic.png
-+ $(MAKE) -C po/ install enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR)
-
- uninstall:
- rm -f $(bindir)/gperiodic \
-@@ -58,10 +50,10 @@ uninstall:
- $(iconsdir)/hicolor/32x32/apps/gperiodic.png \
- $(iconsdir)/hicolor/48x48/apps/gperiodic.png \
- $(iconsdir)/hicolor/64x64/apps/gperiodic.png
-- make -C po/ uninstall enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR)
-+ $(MAKE) -C po/ uninstall enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR)
-
- clean:
- rm -f *.o gperiodic gperiodic.desktop
-- make -C po/ clean
-+ $(MAKE) -C po/ clean
-
- .PHONY: install uninstall clean
diff --git a/sci-chemistry/gperiodic/files/gperiodic-3.0.1-nls.patch b/sci-chemistry/gperiodic/files/gperiodic-3.0.1-nls.patch
deleted file mode 100644
index 4420ca68e58..00000000000
--- a/sci-chemistry/gperiodic/files/gperiodic-3.0.1-nls.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- po/Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/po/Makefile b/po/Makefile
-index d7d7d78..c596e5b 100644
---- a/po/Makefile
-+++ b/po/Makefile
-@@ -26,10 +26,12 @@ endif
-
- install:
- $(MAKE) all
-+ifeq ($(enable_nls),1)
- for f in $(FILES_MO) ; do \
- mkdir -p $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \
- install -m 644 $$f $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; \
- done
-+endif
-
- uninstall:
- for f in $(FILES_MO) ; do \
diff --git a/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild b/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild
deleted file mode 100644
index 64e36c7c268..00000000000
--- a/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Periodic table application for Linux"
-HOMEPAGE="https://sourceforge.net/projects/gperiodic/"
-SRC_URI="http://www.frantz.fi/software/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="nls"
-
-RDEPEND="
- sys-libs/ncurses:0
- x11-libs/gtk+:2
- x11-libs/cairo[X]
- nls? ( sys-devel/gettext )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-makefile.patch \
- "${FILESDIR}"/${P}-nls.patch
- sed \
- -e '/Encoding/d' \
- -i ${PN}.desktop || die
-}
-
-src_compile() {
- local myopts
- use nls && myopts="enable_nls=1" || myopts="enable_nls=0"
- emake CC=$(tc-getCC) ${myopts}
-}
-
-src_install() {
- local myopts
- use nls && myopts="enable_nls=1" || myopts="enable_nls=0"
- emake DESTDIR="${D}" ${myopts} install
- dodoc AUTHORS ChangeLog README NEWS
- newdoc po/README README.translation
-}
diff --git a/sci-chemistry/gperiodic/gperiodic-3.0.1.ebuild b/sci-chemistry/gperiodic/gperiodic-3.0.1.ebuild
deleted file mode 100644
index 511cfe2ba42..00000000000
--- a/sci-chemistry/gperiodic/gperiodic-3.0.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Periodic table application for Linux"
-HOMEPAGE="https://sourceforge.net/projects/gperiodic/"
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="nls"
-MY_AVAILABLE_LINGUAS=" be bg cs da de es fi fr gl id is it lt ms nl pl pt_BR pt ru sv tr uk"
-
-RDEPEND="
- sys-libs/ncurses:0
- x11-libs/gtk+:2
- x11-libs/cairo[X]
- nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-makefile.patch \
- "${FILESDIR}"/${P}-nls.patch
- for lang in ${MY_AVAILABLE_LINGUAS}; do
- if ! has ${lang} ${LINGUAS-${lang}}; then
- einfo "Cleaning translation for ${lang}"
- rm po/${lang}.po || die
- fi
- done
-}
-
-src_compile() {
- local myopts
- use nls && myopts="enable_nls=1" || myopts="enable_nls=0"
- emake \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- CC=$(tc-getCC) ${myopts}
-}
-
-src_install() {
- local myopts
- use nls && myopts="enable_nls=1" || myopts="enable_nls=0"
- emake DESTDIR="${D}" ${myopts} install
- dodoc AUTHORS ChangeLog README
- newdoc po/README README.translation
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-06-30 9:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-30 9:27 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gperiodic/, sci-chemistry/gperiodic/files/ Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox