diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
| commit | b7ebc951da8800f711142f69d9d958bde67a112d (patch) | |
| tree | e318514216845acb8f2e49fff7a5cba4027e9d91 /dev-libs/libbulletml | |
| parent | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff) | |
gentoo resync : 28.04.2019
Diffstat (limited to 'dev-libs/libbulletml')
| -rw-r--r-- | dev-libs/libbulletml/Manifest | 6 | ||||
| -rw-r--r-- | dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch | 12 | ||||
| -rw-r--r-- | dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch | 4 | ||||
| -rw-r--r-- | dev-libs/libbulletml/libbulletml-0.0.6.ebuild | 19 |
4 files changed, 22 insertions, 19 deletions
diff --git a/dev-libs/libbulletml/Manifest b/dev-libs/libbulletml/Manifest index ea2f1e2826ec..aa57a8793f90 100644 --- a/dev-libs/libbulletml/Manifest +++ b/dev-libs/libbulletml/Manifest @@ -1,5 +1,5 @@ -AUX libbulletml-0.0.6-gcc43.patch 589 BLAKE2B be9c071b8dfcfaac9ec1d0d55e47e5c83512607468c7c53d8adf03115fccd397c8273978cbcd1871d0b29a6b0c5a411b7ce2769e14db6131f6c9d20fe36ee2ab SHA512 63cf59a3d7edf660cefe103790d56e8f7c630a4247b0a704b538f3006b1159d4b9942bd1576993f7addb888029dfbf1668e802e809972c8273f58a21f1d339a0 -AUX libbulletml-0.0.6-gcc46.patch 400 BLAKE2B 6bd9f06ff92fc394c2a4ff40de819588ee2a71e56e6b5318864fa62bcfe55dac4ee8b6dc48d8348dd25e472eca37b178721c6d8c990e7df3c79402f42911f210 SHA512 5ad1ff38abaf23b8ff191cf2c5897029d8808303453a58e2749b6756f1e0829511c4376deda4d02047afe6e664245875176fe7d9ca505cdc31c7f9ac8f230e5a +AUX libbulletml-0.0.6-gcc43.patch 577 BLAKE2B 14fe2e1087addc3d4230bdeab2ea19a318c721b1fef66de2a090c153b0e3c6e40f015385db724c2f244fbef94c1c80f792e875899137eab622f4fa27b81dc7dc SHA512 ae8e162ed7297302e40f5139557362fb1271ae8278c9efc0ddff73ab10cad6ec59c0aa281f4eed39d56b3ca64d0e42f7a51fabc2ecaee98870dd8f6458251803 +AUX libbulletml-0.0.6-gcc46.patch 400 BLAKE2B 55fe3b5b3c8f0b29f9df22976ba1647feb5ec3bbfb366b6057211c3f65c1933f97fd6818a232563f0aa3ae03fb5a981d47412786d66aeaf13405694daa880767 SHA512 4f053c3e7a7fb33317f4ac1bf4801593bf16b9c08a219ef2636ead641c7d1147ce01db59d7b9ae315c674f95d3e2973387368e555fa4883fcbb1867ff5349894 DIST libbulletml-0.0.6.tar.bz2 94529 BLAKE2B 7ec9a69c4385adacc476cacb3f88219a5a7b506a36ece6d430a1a5c470ffddfd20f8f355ac5391c542850b98edf0d40e9dea6061b6ad5da7afcc66b14656311b SHA512 4428d8088eefd2a1336eb963e8c65188b67a82d875cdcb51bad9ca7aa3c864b3453464daf1e6691d52120332fe3a078b9827136d214d9ca87fdd0cb81bb60150 -EBUILD libbulletml-0.0.6.ebuild 824 BLAKE2B 14fba0b16a486cf2cac54d7207378de8f57eaec86b553c33bb2dc28b1dfb96d0b48a9f0dbaac578b84528599e22a07505faeacc395c4a5199473035650706d90 SHA512 9b10204e9dab81bca483934fe09a84ecd94ea72e2901b74f02a255a016a2180022df9003986b7cf36d4577bda6163fe2081141e0e31247baeb6be79c73849fca +EBUILD libbulletml-0.0.6.ebuild 904 BLAKE2B 01872e65adae7dd8f898bfde9704b74a10a9bab404ba8744596a85b44515c1ebae6eb7852208825841e4cef5b8c7433bb7a68af3e6d5aae18e179add9ad5af40 SHA512 e92728d15989224258f7fe31970285ba7ac3c2597e5805dc9f87a2eea6a21744d47bd2ccc95e94376ea9e211fe62313b502da375d4661aa15f5e1faa3a8cc2ec MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 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 f7e9bfbab9b1..2cbbda199f4b 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 47e0dc411ac9..ab94deaf7c5f 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 8a90adf32396..045879e2c0f5 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,12 +15,16 @@ 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 + sed -i -e '/^CFLAGS =/d;/^CXXFLAGS =/d' Makefile ygg/Makefile || die } src_compile() { |