From cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 9 Jun 2018 09:27:03 +0100
Subject: gentoo resync : 09.06.2018

---
 media-libs/glu/Manifest            |  4 ++--
 media-libs/glu/glu-9.0.0-r1.ebuild | 13 ++++---------
 media-libs/glu/glu-9999.ebuild     | 24 ++++++++++++++++--------
 3 files changed, 22 insertions(+), 19 deletions(-)

(limited to 'media-libs/glu')

diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest
index aab9ebae3d94..4b10a2b8b3c6 100644
--- a/media-libs/glu/Manifest
+++ b/media-libs/glu/Manifest
@@ -1,4 +1,4 @@
 DIST glu-9.0.0.tar.bz2 493206 BLAKE2B 9c8c27bf8b415f4962079f200f64d4ecadaabecc7cddf832ccc75146b30260bb386ddb87cee26d911f6b7c2451ed0484e0fe8bfa39ac27e33b87a2b5d025ca81 SHA512 ff920e3fbca739794e1432a92fdd8517aa732110fea71ed724185425042f83ce18e9866c16f95c6e10f6993f0814a90fac9636e2b3d8ca2084d1ac0a860f61c8
-EBUILD glu-9.0.0-r1.ebuild 934 BLAKE2B 7db1fe47fe9529f5131da6492f6bac37e7ac8135cf683975b5c623e43589e9f97247926a0c25efcc31ca945b51dec1b735da6c41f59ed4ffc041ce55f3564930 SHA512 0d446a7710e976d497a0b9e48134d86cbd9d902cff92b3e97c9522ffbef29aa2c2a71bea8cf89bdc57ded88af7b3e6b28e635769829538573de5ef86399feba2
-EBUILD glu-9999.ebuild 957 BLAKE2B 6d291485eb4d029da1d5a078fc490c11abc2c7acdf630e062275ea50e52831dda3dc80b510d7becf954e59e7562522ba726ef5f64341207dff2b7c927503cee2 SHA512 5dc2c93e480e2ad4f7d59fb248396b2130716ebcbb8cd6e26b9ce9be06a487f9710013c98acdf1a438aab749d62dd0c7f3d8c4edaf9b16f31d61e027007feeb9
+EBUILD glu-9.0.0-r1.ebuild 866 BLAKE2B 606c9f855435751dd58b9495d2afa9f7fb68186a9076ee12235b3444c3e35deec3b14730319faacf4b27028400d929180fc0acbb1be54c09cc605ec04b1ca544 SHA512 6bfeb606a727dcf359be4a073790eb6c32a39a59bcc06ca415a9cff8dfdf1d8c6d608682ab2dbc5260d161050cc8a940d5119ce5d23dc3be460f6d048845ee54
+EBUILD glu-9999.ebuild 1110 BLAKE2B ff62ebb8660e3507d3bb8a72859a52b914577e25bbdcb1cee3a665988b3eb9c37d44e4f1036dbfc34ce564e7efbaa5a51112894b8afa66cef008949a9fbdfe89 SHA512 f60e1a9f41a41488e8d53d1c1fd11d07e44d5a29e00b87af9d640d01ea3b711a5b36bac1fca2aa22ab4257e2be6275e5f18fa4a07e83f40636236d3172bc1cdc
 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/media-libs/glu/glu-9.0.0-r1.ebuild b/media-libs/glu/glu-9.0.0-r1.ebuild
index 3f4f63eaf043..379b61d7c309 100644
--- a/media-libs/glu/glu-9.0.0-r1.ebuild
+++ b/media-libs/glu/glu-9.0.0-r1.ebuild
@@ -3,39 +3,34 @@
 
 EAPI=5
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/glu.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/glu.git"
 
 if [[ ${PV} = 9999* ]]; then
 	AUTOTOOLS_AUTORECONF=1
-	GIT_ECLASS="git-2"
+	GIT_ECLASS="git-r3"
 	EXPERIMENTAL="true"
 fi
 
 inherit autotools-multilib multilib ${GIT_ECLASS}
 
 DESCRIPTION="The OpenGL Utility Library"
-HOMEPAGE="https://cgit.freedesktop.org/mesa/glu/"
+HOMEPAGE="https://gitlab.freedesktop.org/mesa/glu"
 
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="SGI-B-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}
 	!<media-libs/mesa-9"
 
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
-}
-
 src_test() {
 	:;
 }
diff --git a/media-libs/glu/glu-9999.ebuild b/media-libs/glu/glu-9999.ebuild
index 684f3b54380a..b743ef44af75 100644
--- a/media-libs/glu/glu-9999.ebuild
+++ b/media-libs/glu/glu-9999.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/glu.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/glu.git"
 
 if [[ ${PV} = 9999* ]]; then
 	AUTOTOOLS_AUTORECONF=1
-	GIT_ECLASS="git-2"
+	GIT_ECLASS="git-r3"
 	EXPERIMENTAL="true"
 fi
 
-inherit autotools-multilib multilib ${GIT_ECLASS}
+inherit autotools multilib-minimal ${GIT_ECLASS}
 
 DESCRIPTION="The OpenGL Utility Library"
-HOMEPAGE="https://cgit.freedesktop.org/mesa/glu/"
+HOMEPAGE="https://gitlab.freedesktop.org/mesa/glu"
 
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
@@ -32,9 +31,18 @@ DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}
 	!<media-libs/mesa-9"
 
-src_unpack() {
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
 	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
+	find "${D}" -name '*.la' -delete || die
 }
 
 src_test() {
-- 
cgit v1.2.3