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

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

[Vadim A. Misbakh-Soloviov]

commit:     ebc57d6b5a36fc573dc9fc6cd864d8d46a267dac
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Sun Jul 16 07:10:40 2017 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sun Jul 16 07:10:40 2017 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=ebc57d6b

libbulletml: bump to EAPI6 + fixes (BZ#623814)

 .../files/libbulletml-0.0.6-gcc43.patch            | 12 +++---
 dev-libs/libbulletml/libbulletml-0.0.6-r1.ebuild   | 49 ++++++++++------------
 2 files changed, 28 insertions(+), 33 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 f7e9bfb..e7e4a1d 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/src/calc.yy
++++ b/src/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/src/tinyxml/tinyxml.h
++++ b/src/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/src/tinyxml/tinyxmlparser.cpp
++++ b/src/tinyxml/tinyxmlparser.cpp
 @@ -24,6 +24,7 @@
  
  #include "tinyxml.h"

diff --git a/dev-libs/libbulletml/libbulletml-0.0.6-r1.ebuild b/dev-libs/libbulletml/libbulletml-0.0.6-r1.ebuild
index 5b478c9..ee59874 100644
--- a/dev-libs/libbulletml/libbulletml-0.0.6-r1.ebuild
+++ b/dev-libs/libbulletml/libbulletml-0.0.6-r1.ebuild
@@ -1,57 +1,52 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbulletml/libbulletml-0.0.6-r1.ebuild,v 1.6 2009/08/27 15:47:32 frostwork Exp $
 
-EAPI="2"
+EAPI="6"
 
 inherit eutils
 
 DESCRIPTION="A Library of Bullet Markup Language"
 HOMEPAGE="http://user.ecc.u-tokyo.ac.jp/~s31552/wp/libbulletml/index_en.html"
-SRC_URI="mirror://debian/pool/main/b/${PN#lib}/${PN#lib}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/b/${PN#lib}/${PN#lib}_${PV}-4.diff.gz"
+SRC_URI="
+	mirror://debian/pool/main/b/${PN#lib}/${PN#lib}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/b/${PN#lib}/${PN#lib}_${PV}-6.1.debian.tar.bz2
+"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-S="${WORKDIR}/${PN#lib}-${PV}/src"
+S="${WORKDIR}/${PN#lib}"
+
+PATCHES=(
+	"${WORKDIR}/debian/patches"
+	"${FILESDIR}/${P}-gcc43.patch"
+)
 
-src_unpack() {
-	unpack ${A}
-}
 src_prepare(){
-	epatch "${WORKDIR}"/${PN#lib}_${PV}-4.diff
-	mv "${WORKDIR}"/${PN#lib}/* "${WORKDIR}"/${PN#lib}-${PV}
-	sed -i -e "s:\MAJOR=0d2:\MAJOR=0:g" -i "${WORKDIR}"/${PN#lib}-${PV}/debian/patches/makefile.patch
-	epatch "${WORKDIR}"/${PN#lib}-${PV}/debian/patches/fixes.patch
-	epatch "${WORKDIR}"/${PN#lib}-${PV}/debian/patches/bulletml_d.patch
-	epatch "${WORKDIR}"/${PN#lib}-${PV}/debian/patches/d_cpp.patch
-	epatch "${WORKDIR}"/${PN#lib}-${PV}/debian/patches/warnings.patch
-	epatch "${WORKDIR}"/${PN#lib}-${PV}/debian/patches/makefile.patch
-	epatch "${WORKDIR}"/${PN#lib}-${PV}/debian/patches/includes.patch
-	cd "${S}"
-	epatch "${WORKDIR}"/${PN#lib}-${PV}/debian/patches/get-rid-of-boost.patch
-	epatch "${FILESDIR}"/${P}-gcc43.patch
+	sed -i -e "s:\MAJOR=0d2:\MAJOR=0:g" -i "${WORKDIR}"/debian/patches/makefile.patch
+	default
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die "emake failed"
+	emake -C src CFLAGS="${CFLAGS} -fPIC" CXXFLAGS="${CXXFLAGS} -fPIC" LDFLAGS="${LDFLAGS} -fPIC" || die "emake failed"
 }
 
 src_install() {
-	dolib.a libbulletml.a || die "dolib.a failed"
-	dolib libbulletml.so.0.0 libbulletml.so libbulletml.so.0 || die "dolib failed"
+	cd "${S}/src"
+
+	dolib.a libbulletml.a
+	dolib libbulletml.so*
 
 	insinto /usr/include/bulletml
-	doins *.h || die "doins .h failed"
+	doins *.h
 
 	insinto /usr/include/bulletml/tinyxml
-	doins tinyxml/tinyxml.h || die "doins tinyxml.h failed"
+	doins tinyxml/tinyxml.h
 
 	insinto /usr/include/bulletml/ygg
-	doins ygg/ygg.h || die "doins ygg.h failed"
+	doins ygg/ygg.h
 
 	dodoc ../README*
 }