[gentoo-commits] repo/gentoo:master commit in: dev-libs/libbulletml/files/, dev-libs/libbulletml/

[Andreas Sturmlechner]

commit:     f3aec25a5c94b378ee71bf0f7c2e2a76a98faabc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 25 21:41:49 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 21:55:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3aec25a

dev-libs/libbulletml: EAPI-7 bump, https

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch | 12 ++++++------
 dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch |  4 ++--
 dev-libs/libbulletml/libbulletml-0.0.6.ebuild            | 16 ++++++++--------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch b/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch
index f7e9bfbab9b..2cbbda199f4 100644
--- a/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch
+++ b/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch
@@ -1,5 +1,5 @@
---- src/calc.yy
-+++ src/calc.yy
+--- a/calc.yy
++++ b/calc.yy
 @@ -8,6 +8,7 @@
  
  #include <cmath>
@@ -8,8 +8,8 @@
  
  #include <vector>
  #include <sstream>
---- src/tinyxml/tinyxml.h
-+++ src/tinyxml/tinyxml.h
+--- a/tinyxml/tinyxml.h
++++ b/tinyxml/tinyxml.h
 @@ -28,6 +28,8 @@
  #include <string>
  #include <stdio.h>
@@ -19,8 +19,8 @@
  
  class TiXmlDocument;
  class TiXmlElement;
---- src/tinyxml/tinyxmlparser.cpp
-+++ src/tinyxml/tinyxmlparser.cpp
+--- a/tinyxml/tinyxmlparser.cpp
++++ b/tinyxml/tinyxmlparser.cpp
 @@ -24,6 +24,7 @@
  
  #include "tinyxml.h"

diff --git a/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch b/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch
index 47e0dc411ac..ab94deaf7c5 100644
--- a/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch
+++ b/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch
@@ -1,5 +1,5 @@
---- calc.yy.old	2011-05-18 12:26:38.701666366 +0200
-+++ calc.yy	2011-05-18 12:27:43.020672135 +0200
+--- a/calc.yy	2011-05-18 12:26:38.701666366 +0200
++++ b/calc.yy	2011-05-18 12:27:43.020672135 +0200
 @@ -17,7 +17,7 @@
  #include "formula.h"
  #include "formula-variables.h"

diff --git a/dev-libs/libbulletml/libbulletml-0.0.6.ebuild b/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
index 62b2ec3e1b7..045879e2c0f 100644
--- a/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
+++ b/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A Library of Bullet Markup Language"
-HOMEPAGE="http://shinh.skr.jp/libbulletml/index_en.html"
-SRC_URI="http://shinh.skr.jp/libbulletml/${P}.tar.bz2"
+HOMEPAGE="https://shinh.skr.jp/libbulletml/index_en.html"
+SRC_URI="https://shinh.skr.jp/libbulletml/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
@@ -16,11 +15,12 @@ IUSE=""
 DEPEND="dev-libs/boost"
 RDEPEND=${DEPEND}
 
-S=${WORKDIR}/${PN#lib}/src
+PATCHES=( "${FILESDIR}"/${P}-gcc4{3,6}.patch )
+
+S="${WORKDIR}"/${PN#lib}/src
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc46.patch
+	default
 	rm -r boost || die
 
 	# don't override the system-wide flags