diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/Manifest b/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/Manifest index afa8666710..8cf257d0dc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/Manifest @@ -1 +1,7 @@ -DIST ctemplate-1.0.tar.gz 837995 RMD160 ca1fdc571a869280d0395f919191a0773505c9d0 SHA1 313e3ee7f9e28adb537c08212eb509bdb848de56 SHA256 731279f1717527cf85ff79ed19b8674f91c3768d8bc20b09440e8dd1ca1b5bf8 +AUX 70ctemplate-gentoo.el 282 SHA256 5b0f78a1bfc6171856ba0822612cff0a0451ee9c7969ab4ae935f15eed715de7 SHA512 36bc5424cb6dce40026f1d08b8764bf43d42159ff20e7d81484f5baf1c1e3c2042c12b1a60fc3cef48e297e816a12dbc41169988a6537ee41a2e2528b3c834a3 WHIRLPOOL ed954cb7e7f9bf7986b1b5c8547e7dd3e9e1f742d1d13a39ad9d126c0c410f7617c04b76a32c8eb93173d74a157d1be84b40d1196d9557ab9e9343b057db7cb1 +AUX ctemplate-2.3-fix-build-system.patch 1196 SHA256 7ca362114e33ca182adab5a1e24d9029392d55c6986fc75c5c58b764daf4e3d0 SHA512 4402af1034780d00f733231d9ce534cf54a4474a1153bc534274bc2f5163aba8b39e2ad7613151ffd34f3b7d4ba1d3a0c51badf8f1712aea6a1b65d963e3bea4 WHIRLPOOL b0e20709aa823d23c714342326df2fb604a805a469a02ced849a2757b6fec28b9b276f093f3d9bf49d84c18f9c238d5cfe7a5be4c24c4c5ed62c4ff90cb6b663 +DIST ctemplate-2.3.tar.bz2 564389 SHA256 6409e74486888be371cf29900ba757e5443c958295f2099359d5ef6a6acceeec SHA512 546645389a8bfed59686b62b43cb7d53714ac98e1b75311c217bb0f3b6201d5d486766b1ce7e35bf15032372e45c36b27008f54085bd0c9ef0dd0b7e04b8e3f5 WHIRLPOOL 9261906ddb6857a378aa9f86a9cd87b6fcb9c79c442ff2b87ddf92021fdd64140f3cb87cbb2b1f3775fa2f5a0d039d1b4ceca3cf07f1efc841fbfb72e9f1467e +EBUILD ctemplate-2.3-r1.ebuild 1533 SHA256 2d1c1934ec21360f48949436426ce7395372f9a9b7e66635cea1a0ca8e8ab7d1 SHA512 8e338af1b10165d16b113eb008f744ff96d68e4f242efa6aea3abe0add00526095ee7055e2b832f012042d182e573c4b3811c8974e33fb621935cdfbcd52ea63 WHIRLPOOL 286c68ad767e6bcbcca2481a015bf900ef33472c2292a96fafcf953dd853f83239f43a1fd8417861c7429578063bc62b509fe0c04be3f4ce30512366645c0cd7 +MISC ChangeLog 3473 SHA256 b0d7f6509dd58effe9bc7569abe2d5a6baa8ff63b4eecfa247ae01397263885c SHA512 22c3eb6394120f0b8a94787a6e69cae875963d38f513cde244a72ecada11504b94dc1ce7631cb75794dc65d886e3bbd5b1653beb6896650ec7f03c3464b1d32d WHIRLPOOL 46e41dfdb21dda991e6037acea72d1a8c7afd13fda4e8422c01768a4d72d817f5b694e231a5254f748d857400a14491b4151437f0e47b735a1520c2ac3aa2623 +MISC ChangeLog-2015 4690 SHA256 ad5565672f2b970e7c6dc4987b6f91455487d469e622eed3fd8e951e3d8d2a13 SHA512 111f2e9abc95f12056acc3df635276d0a83932704bcc87bdc973182dc4f1b9ef5d139753fe49e2c5cd904640a1f12e6dd2a89c4db3bd155d63522767f19abbdd WHIRLPOOL c7e1d9167c1549874210b7c5a01d197fc7654ec39cd9c8047b5a78cb55d7f2bb515a9d671ff6d18d4b5da24d5ea296d0e6b8bfbec851bfe99c992bc87a708bd0 +MISC metadata.xml 395 SHA256 f5f0f36f2cf6bf4cc7a5082e609a2a21ab327428e5ac5c666495c53eb30409db SHA512 5b2ac214c10f83e739157b6530e9d19f9197eef74261f9581aa3861f0e7480e5476e6265c1769d0e944b434a78c8a17dc286918665e261757b79127d2f55b93a WHIRLPOOL a763a913d5cfcfcb23b424026bb20496e7c87a2e4d23da86379c962540abfef862b20f0e044a05fe2909be88fe504624ba6d198dc97a5b9c754e981ff7cb8e64 diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/ctemplate-1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/ctemplate-1.0.ebuild deleted file mode 100644 index f6c2b810e1..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/ctemplate-1.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ctemplate/ctemplate-1.0.ebuild,v 1.7 2012/05/24 19:27:18 vapier Exp $ - -EAPI="4" - -inherit elisp-common python eutils - -DESCRIPTION="A simple but powerful template language for C++" -HOMEPAGE="http://code.google.com/p/google-ctemplate/" -SRC_URI="http://google-ctemplate.googlecode.com/files/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="doc emacs vim-syntax static-libs test" - -DEPEND="test? ( =dev-lang/python-2* )" -RDEPEND="vim-syntax? ( >=app-editors/vim-core-7 ) - emacs? ( virtual/emacs )" - -SITEFILE="70ctemplate-gentoo.el" - -pkg_setup() { - if use test ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc-4.7.patch -} - -src_configure() { - econf \ - --enable-shared \ - $(use_enable static-libs static) -} - -src_compile() { - default - - if use emacs ; then - elisp-compile contrib/tpl-mode.el || die "elisp-compile failed" - fi -} - -src_install() { - default - - # Installs just every piece - rm -rf "${ED}/usr/share/doc" - - dodoc AUTHORS ChangeLog NEWS README - use doc && dohtml doc/* - - if use vim-syntax ; then - cd "${S}/contrib" - sh highlighting.vim || die "unpacking vim scripts failed" - insinto /usr/share/vim/vimfiles - doins -r .vim/* - fi - - if use emacs ; then - cd "${S}/contrib" - elisp-install ${PN} tpl-mode.el tpl-mode.elc || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - find "${ED}"/usr -name '*.la' -delete -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/ctemplate-2.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/ctemplate-2.3-r1.ebuild new file mode 100644 index 0000000000..a578d0f6a2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/ctemplate-2.3-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit autotools elisp-common python-any-r1 + +DESCRIPTION="A simple but powerful template language for C++" +HOMEPAGE="https://github.com/olafvdspek/ctemplate" +SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux" +IUSE="doc emacs vim-syntax static-libs test" + +DEPEND="test? ( ${PYTHON_DEPS} )" +RDEPEND=" + emacs? ( virtual/emacs ) + vim-syntax? ( >=app-editors/vim-core-7 )" + +SITEFILE="70ctemplate-gentoo.el" + +# Some tests are broken in 2.3 +RESTRICT="test" + +PATCHES=( "${FILESDIR}"/${PN}-2.3-fix-build-system.patch ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf $(use_enable static-libs static) +} + +src_compile() { + default + + if use emacs; then + elisp-compile contrib/tpl-mode.el + fi +} + +src_install() { + default + if ! use doc; then + rm -r "${ED%/}"/usr/share/doc/${PF}/html || die + fi + + if use vim-syntax; then + cd "${S}/contrib" || die + sh highlighting.vim || die "unpacking vim scripts failed" + insinto /usr/share/vim/vimfiles + doins -r .vim/. + fi + + if use emacs; then + cd "${S}/contrib" || die + elisp-install ${PN} tpl-mode.el tpl-mode.elc + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + + # package provides .pc files + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/files/ctemplate-1.0-gcc-4.7.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/files/ctemplate-1.0-gcc-4.7.patch deleted file mode 100644 index a8eaaa6fa1..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/files/ctemplate-1.0-gcc-4.7.patch +++ /dev/null @@ -1,29 +0,0 @@ -backported fix from ctemplate-2.2 for building with gcc-4.7+ - ---- ctemplate-1.0/src/base/small_map.h -+++ ctemplate-1.0/src/base/small_map.h -@@ -360,20 +360,20 @@ class small_map { - if (size_ >= 0) { - for (int i = 0; i < size_; i++) { - if (compare(array_[i]->first, x.first)) { -- return make_pair(iterator(array_ + i), false); -+ return std::make_pair(iterator(array_ + i), false); - } - } - if (size_ == kArraySize) { - ConvertToRealMap(); // Invalidates all iterators! - std::pair ret = map_->insert(x); -- return make_pair(iterator(ret.first), ret.second); -+ return std::make_pair(iterator(ret.first), ret.second); - } else { - array_[size_].Init(x); -- return make_pair(iterator(array_ + size_++), true); -+ return std::make_pair(iterator(array_ + size_++), true); - } - } else { - std::pair ret = map_->insert(x); -- return make_pair(iterator(ret.first), ret.second); -+ return std::make_pair(iterator(ret.first), ret.second); - } - } - diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/files/ctemplate-2.3-fix-build-system.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/files/ctemplate-2.3-fix-build-system.patch new file mode 100644 index 0000000000..4178f5ed36 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/files/ctemplate-2.3-fix-build-system.patch @@ -0,0 +1,29 @@ +* Do not override $(docdir) as userflag in the GNU conventions +* Only build tests programs when running 'make check' + +--- a/Makefile.am ++++ b/Makefile.am +@@ -54,12 +54,11 @@ + src/ctemplate/per_expand_data.h.in \ + src/ctemplate/str_ref.h.in + +-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION) + ## This is for HTML and other documentation you want to install. + ## Add your documentation files (in doc/) in addition to these + ## top-level boilerplate files. Also add a TODO file if you have one. +-dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README README_windows.txt \ +- doc/designstyle.css doc/index.html \ ++dist_doc_DATA = AUTHORS ChangeLog NEWS README README_windows.txt ++dist_html_DATA = doc/designstyle.css doc/index.html \ + doc/howto.html doc/guide.html doc/reference.html \ + doc/tips.html doc/example.html doc/auto_escape.html \ + doc/xss_resources.html +@@ -452,7 +451,7 @@ + + ## This should always include $(TESTS), but may also include other + ## binaries that you compile but don't want automatically installed. +-noinst_PROGRAMS = $(TESTS) ++check_PROGRAMS = $(TESTS) + + rpm: dist-gzip packages/rpm.sh packages/rpm/rpm.spec + @cd packages && ./rpm.sh ${PACKAGE} ${VERSION} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/metadata.xml new file mode 100644 index 0000000000..02bed0f210 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/ctemplate/metadata.xml @@ -0,0 +1,12 @@ + + + + + cpp@gentoo.org + Gentoo C++ Project + + + google-ctemplate + olafvdspek/ctemplate + + diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/ctemplate-1.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/ctemplate-1.0 deleted file mode 100644 index a450a3d7a2..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/ctemplate-1.0 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup -DEPEND=test? ( =dev-lang/python-2* ) -DESCRIPTION=A simple but powerful template language for C++ -EAPI=4 -HOMEPAGE=http://code.google.com/p/google-ctemplate/ -IUSE=doc emacs vim-syntax static-libs test -KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux -LICENSE=BSD -RDEPEND=vim-syntax? ( >=app-editors/vim-core-7 ) emacs? ( virtual/emacs ) -SLOT=0 -SRC_URI=http://google-ctemplate.googlecode.com/files/ctemplate-1.0.tar.gz -_eclasses_=elisp-common 9f56c4e9bf1282dbfc2a5a09e1124e74 eutils ea170b525f6a38a006be05c9d9429f13 multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=c169b8730521c80c2466008fb5631eae diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/ctemplate-2.3-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/ctemplate-2.3-r1 new file mode 100644 index 0000000000..e14ab81c1e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/ctemplate-2.3-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup +DEPEND=test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170317 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=A simple but powerful template language for C++ +EAPI=6 +HOMEPAGE=https://github.com/olafvdspek/ctemplate +IUSE=doc emacs vim-syntax static-libs test +KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux +LICENSE=BSD +RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( >=app-editors/vim-core-7 ) +RESTRICT=test +SLOT=0 +SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/ctemplate-2.3.tar.bz2 +_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 elisp-common 19ff54b35acd0bf2a14831a308a57753 libtool e32ea84bf82cf8987965b574672dba93 multilib 0236be304ee52e7f179ed2f337075515 python-any-r1 be89e882151ba4b847089b860d79729c python-utils-r1 c11fc374357e6ad9ddfe2e9f931e4d29 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee +_md5_=e2dab5309d927f1c938e9164a320ffc2