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

3 files changed, 30 insertions, 55 deletions

diff --git a/dev-libs/libbulletml/Manifest b/dev-libs/libbulletml/Manifest
index bbbbeae..5ce45d3 100644
--- a/dev-libs/libbulletml/Manifest
+++ b/dev-libs/libbulletml/Manifest
@@ -1,22 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST bulletml_0.0.6-4.diff.gz 17522 SHA256 6751732806c172d8d757fd72c4bf791700dca2b73e59d8bdbac5aed7b4512a01
-DIST bulletml_0.0.6.orig.tar.gz 85748 SHA256 162544e708cd8f61c944f7eac2a0403d2900d29fa9b1dc45235cfccfac8ae960
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQlghaAAoJECZQPTSbOzNLnv4P/2pw+BifwMpWdOvzySukE55Q
-Y2AkbAxiu8PYsFD3m4+L7uxkQ69Vx1opYXDtA1ZEvadNV/Kmh7DccKFwedEuu1ZW
-KML9Y33RNrWuaSJTeN4cYVhYN+Rq3HhHG5nkP2fr6OAkSSqWhDEsduIku5tFyLY3
-O6zRofMEozGEfJZYMeum4drKdOk7m/DjtU9dId7lghyvlZy71jo6We/rjfBZcY++
-IQeRJN2Ka4ofTUlk4j55UHvY8FIz+1IWBu9Ii/ukXEI+20Awu+0WOUrRVkPXJ++Q
-dl0Ifkcw4XIZuvXWpvGFpe4RnjTIFQ8WRbB/NCNVRLTE9MrxYSpMkuhXjtTVPaRo
-tpg/Je3FL06S/Ph/3ZFKkU8MmKhKgOVqtxpm+F1Bsst4rmR3OrPvRJvfxNsRW2+J
-AvcdwvKuc7eTb7n1aj9gKFAJB1/OSTEzPoUUhTo5xttawF35tyDVs42RUSnd66yG
-GgFcZsA5mDwuT97BhNqo9IjJdPJu4kC1/4xoafusPDs0cjH6Oi4eN5Bq6yDMiwZ4
-vkT9gr6q2LQ2Sm1kJEJExrR8SW8iMCu4L5sZilyp1PtGcq9aZd5oBIL1nymxa8nO
-h15CW1F8C26ifTYqqAUdm2DNqAb6uS+6X7cWYqf7M/JGRVo8ejBpKUT/875xPM/8
-Q9nMs6qAG/gXf2lPQa+v
-=+37P
------END PGP SIGNATURE-----
+DIST bulletml_0.0.6-6.1.debian.tar.bz2 18230 SHA256 87c220b603149e8e8786d128fe41a983f98dbeb04dd224183ed37589a05b0a50 SHA512 7b81855a99df18830340f5ee0633c441feb779d9bdfc32f11854a98e3c6e850c92d0775cc2689795b10eb83839ca6c9cdf3e926ab5c75f0fbfe1042357fe3d31 WHIRLPOOL 66bfef747ade5a6517d8f1a4020fad10ce10af330128540c41eaa93a49d76377db335751c932d1cf511ca1dab7565eb82d3517a347645fec5bf454bd2d2a9ed0
+DIST bulletml_0.0.6.orig.tar.gz 85748 SHA256 162544e708cd8f61c944f7eac2a0403d2900d29fa9b1dc45235cfccfac8ae960 SHA512 916eff772459384bfbf9b646ebe267dc23f0d54dc2ac1d783fecefa6a212b09566bfc254609be3a0f0fe536fa8252b67ad4892f043d731a2a33b57b9544695e9 WHIRLPOOL a9201741cf6cc09a88dde3fee00339ac5d198ec7344ccdcc75dddef230e54c88e51aeba3a1275ccf7ebb07b4823be5b99f9076667d8d78ac1fffb4577a2cddf4
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*
 }