From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1206147-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 577E8138359 for <garchives@archives.gentoo.org>; Tue, 15 Sep 2020 13:23:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EB51E0958; Tue, 15 Sep 2020 13:23:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68A03E0958 for <gentoo-commits@lists.gentoo.org>; Tue, 15 Sep 2020 13:23:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EAB2C340DB4 for <gentoo-commits@lists.gentoo.org>; Tue, 15 Sep 2020 13:23:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 75D6A364 for <gentoo-commits@lists.gentoo.org>; Tue, 15 Sep 2020 13:23:18 +0000 (UTC) From: "David Seifert" <soap@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org> Message-ID: <1600176181.ca6af58e3d4cd67cba5d3d15e60a47277d6efcfb.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/liboglappth/files/, x11-libs/liboglappth/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/liboglappth/files/gcc-4.3.patch x11-libs/liboglappth/liboglappth-1.0.0-r1.ebuild x11-libs/liboglappth/liboglappth-1.0.0.ebuild X-VCS-Directories: x11-libs/liboglappth/files/ x11-libs/liboglappth/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: ca6af58e3d4cd67cba5d3d15e60a47277d6efcfb X-VCS-Branch: master Date: Tue, 15 Sep 2020 13:23:18 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e5698823-df25-4a46-bebd-b75785a7ae14 X-Archives-Hash: 766903488049a746d252f6ccd0c0b024 commit: ca6af58e3d4cd67cba5d3d15e60a47277d6efcfb Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Tue Sep 15 13:23:01 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Sep 15 13:23:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca6af58e x11-libs/liboglappth: Disable static libraries Closes: https://bugs.gentoo.org/742656 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: David Seifert <soap <AT> gentoo.org> x11-libs/liboglappth/files/gcc-4.3.patch | 10 +++++----- ...ppth-1.0.0.ebuild => liboglappth-1.0.0-r1.ebuild} | 20 +++++++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/x11-libs/liboglappth/files/gcc-4.3.patch b/x11-libs/liboglappth/files/gcc-4.3.patch index bc04b9e97c7..cf45065916b 100644 --- a/x11-libs/liboglappth/files/gcc-4.3.patch +++ b/x11-libs/liboglappth/files/gcc-4.3.patch @@ -1,10 +1,10 @@ ---- a/src/base_wcl.cpp 2008-07-07 23:49:10.000000000 -0700 -+++ b/src/base_wcl.cpp 2008-07-07 23:49:26.000000000 -0700 -@@ -11,6 +11,7 @@ +--- a/src/base_wcl.cpp ++++ b/src/base_wcl.cpp +@@ -22,6 +22,7 @@ #include "base_app.h" #include <stdlib.h> // the definition for NULL... +#include <cstring> - #include <GL/glut.h> - + #include <GL/gl.h> + #include <GL/glu.h> diff --git a/x11-libs/liboglappth/liboglappth-1.0.0.ebuild b/x11-libs/liboglappth/liboglappth-1.0.0-r1.ebuild similarity index 65% rename from x11-libs/liboglappth/liboglappth-1.0.0.ebuild rename to x11-libs/liboglappth/liboglappth-1.0.0-r1.ebuild index c0b2725651a..eb68dba4208 100644 --- a/x11-libs/liboglappth/liboglappth-1.0.0.ebuild +++ b/x11-libs/liboglappth/liboglappth-1.0.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Libary for OpenGL applications with easy-to-code scene setup and selection" HOMEPAGE="http://www.bioinformatics.org/ghemical/" @@ -10,12 +10,22 @@ SRC_URI="http://www.bioinformatics.org/ghemical/download/current/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" RDEPEND=" virtual/opengl media-libs/freeglut" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/gcc-4.3.patch ) + +src_configure() { + econf --disable-static +} + +src_install() { + default + + # no static archives + find "${ED}" -name '*.la' -delete || die +}