[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     d45d5260416bd71ef3b08dde2f4905be0b9ea243
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  8 19:10:44 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Apr  8 19:23:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d45d5260

x11-libs/fltk: Update live ebuilds

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-libs/fltk/fltk-1.3.9999.ebuild | 36 +++++++++++++++++------------
 x11-libs/fltk/fltk-1.4.9999.ebuild | 47 +++++++++++++++++++++++---------------
 2 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index cf4958abf3d..4171029d334 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools fdo-mime flag-o-matic multilib-minimal subversion
+EAPI=7
+inherit autotools fdo-mime flag-o-matic git-r3 multilib-minimal
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
 HOMEPAGE="http://www.fltk.org/"
-ESVN_REPO_URI="http://seriss.com/public/fltk/fltk/branches/branch-1.3/"
-ESVN_USER=""
-ESVN_PASSWORD=""
+EGIT_REPO_URI="https://github.com/fltk/fltk"
+EGIT_OVERRIDE_BRANCH_FLTK_FLTK="branch-1.3"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
@@ -35,23 +34,29 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	virtual/pkgconfig
 	x11-base/xorg-proto
 	doc? ( app-doc/doxygen )
 "
-
 DOCS=(
 	ANNOUNCEMENT
 	CHANGES
+	CHANGES_1.0
+	CHANGES_1.1
 	CREDITS
 	README
+	README.abi-version.txt
+	README.Cairo.txt
+	README.CMake.txt
+	README.MSWindows.txt
+	README.OSX.txt
+	README.Unix.txt
 )
-
 FLTK_GAMES="
 	blocks
 	checkers
 	sudoku
 "
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.0-share.patch
 	"${FILESDIR}"/${PN}-1.3.9999-conf-tests.patch
@@ -144,22 +149,23 @@ multilib_src_install() {
 
 	if multilib_is_native_abi; then
 		emake -C fluid \
-			  DESTDIR="${D}" install-linux
+			DESTDIR="${D}" install-linux
 
 		use doc &&
 			emake -C documentation \
-				  DESTDIR="${D}" install
+				DESTDIR="${D}" install
 
 		use games &&
 			emake -C test \
-				  DESTDIR="${D}" install-linux
+				DESTDIR="${D}" install-linux
 	fi
 }
 
 multilib_src_install_all() {
 	for app in fluid $(usex games "${FLTK_GAMES}" ''); do
-		dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
-			  /usr/share/pixmaps/${app}.png
+		dosym \
+			/usr/share/icons/hicolor/32x32/apps/${app}.png \
+			/usr/share/pixmaps/${app}.png
 	done
 
 	if use examples; then
@@ -180,7 +186,7 @@ multilib_src_install_all() {
 		rm "${ED}"/usr/lib*/fltk/*.a || die
 	fi
 
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {

diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild
index 97500930d11..708271c605b 100644
--- a/x11-libs/fltk/fltk-1.4.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.4.9999.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools fdo-mime flag-o-matic multilib-minimal subversion
+EAPI=7
+inherit autotools fdo-mime flag-o-matic git-r3 multilib-minimal
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
 HOMEPAGE="http://www.fltk.org/"
-ESVN_REPO_URI="http://seriss.com/public/fltk/fltk/branches/branch-1.4/"
-ESVN_USER=""
-ESVN_PASSWORD=""
+EGIT_REPO_URI="https://github.com/fltk/fltk"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
@@ -35,23 +33,35 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	virtual/pkgconfig
 	x11-base/xorg-proto
 	doc? ( app-doc/doxygen )
 "
-
 DOCS=(
 	ANNOUNCEMENT
-	CHANGES
-	CREDITS
-	README
+	CHANGES.txt
+	CHANGES_1.0.txt
+	CHANGES_1.1.txt
+	CHANGES_1.3.txt
+	CREDITS.txt
+	README.Android.md
+	README.CMake.txt
+	README.Cairo.txt
+	README.IDE.txt
+	README.Pico.txt
+	README.Unix.txt
+	README.Windows.txt
+	README.abi-version.txt
+	README.bundled-libs.txt
+	README.macOS.md
+	README.md
+	README.txt
 )
-
 FLTK_GAMES="
 	blocks
 	checkers
 	sudoku
 "
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.0-share.patch
 	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
@@ -143,22 +153,23 @@ multilib_src_install() {
 
 	if multilib_is_native_abi; then
 		emake -C fluid \
-			  DESTDIR="${D}" install-linux
+			DESTDIR="${D}" install-linux
 
 		use doc &&
 			emake -C documentation \
-				  DESTDIR="${D}" install
+				DESTDIR="${D}" install
 
 		use games &&
 			emake -C test \
-				  DESTDIR="${D}" install-linux
+				DESTDIR="${D}" install-linux
 	fi
 }
 
 multilib_src_install_all() {
 	for app in fluid $(usex games "${FLTK_GAMES}" ''); do
-		dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
-			  /usr/share/pixmaps/${app}.png
+		dosym \
+			/usr/share/icons/hicolor/32x32/apps/${app}.png \
+			/usr/share/pixmaps/${app}.png
 	done
 
 	if use examples; then
@@ -179,7 +190,7 @@ multilib_src_install_all() {
 		rm "${ED}"/usr/lib*/fltk/*.a || die
 	fi
 
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {