Sync with portage [Mon Dec 25 10:27:35 MSK 2017].

mhiretskiy 1035
root 6 years ago
parent 1ae62506cb
commit 3847b20562

Binary file not shown.

Binary file not shown.

@ -11,7 +11,7 @@ SRC_URI="http://www.nfb.org/Images/nfb/Products_Technology/nfbtr774.zip"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
DEPEND=" >=app-arch/unzip-5.50-r2"

Binary file not shown.

@ -1,3 +1,4 @@
DIST haskell-updater-1.2.10.tar.gz 26586 BLAKE2B adc46f85118fa55e530aa079ef2df0663b178b15311f4f2ff6474db75aacf1277238a27a2bb98841fc1fe50b556d7f01a677861b3ce9559fe809a02db401ef8d SHA512 c0a72ae77362e5ed4ea0e244449175454119b1284756adeb43534bf58b661f3cabb88e08bd5903d415a9f95a6de309753dedf974ddd853b300fd215250e0ad7c
DIST haskell-updater-1.2.12.tar.gz 26708 BLAKE2B d0b040cb3b6211b3c5c60f8cfa3dbccbf9cb15d246b21609a21aac746a8a034e284fe0b99891b5035980252a7aa8b376ad943f32882dc29e16226d95583cb053 SHA512 f3a993cb556919bf2e57fdaca7eea9146abc59096e779cbffb69a5c29fc5f6ef889c8ccf4d8331dbd9279919ea91bb05a16d83ad70085d5ef5a44d61120fe7e7
DIST haskell-updater-1.2.9.tar.gz 26675 BLAKE2B a3d11cdcee886a07d87cd2888a9deea1d963b7234b4a10a6b78e9467fae4e9382c92f14a6ba0593f86bf9422ab2cb4bec823de96f34b463590ae18429c118edb SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da
DIST haskell-updater-1.3.1.tar.gz 26573 BLAKE2B 68e5357e8f24b9b372dba4feac76595cbf35602d9d9094d616497c9d0040177b5f1def5833770041b693220717f3a4976877e0608858d5d8d4dddd26620c71e5 SHA512 39c36c4a8997806bb4d64625bc9ed72334a68e57f8c32f75d0c3704ab52b3b68605444c89480e5186c04bb275b3608ea9544366ebc5a00e010cc5fb4ae8296df

@ -0,0 +1,47 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
CABAL_FEATURES="bin nocabaldep"
inherit eutils haskell-cabal
DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-lang/ghc-6.12.1"
# Need a lower version for portage to get --keep-going
RDEPEND="|| ( >=sys-apps/portage-2.1.6
sys-apps/pkgcore
sys-apps/paludis )"
src_prepare() {
default
if use prefix; then
sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
"${S}/Distribution/Gentoo/Packages.hs" || die
sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
"${S}/Distribution/Gentoo/GHC.hs" || die
fi
}
src_configure() {
cabal_src_configure \
--bindir="${EPREFIX}/usr/sbin" \
--constraint="Cabal == $(cabal-version)"
}
src_install() {
cabal_src_install
dodoc TODO
}

@ -19,7 +19,7 @@ SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0/18"
KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86"
IUSE="connman cron command-not-found elogind +introspection networkmanager entropy systemd test vala"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}

@ -17,7 +17,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86"
KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
RESTRICT="test"

Binary file not shown.

@ -1,7 +1,12 @@
.include /usr/lib/systemd/system/clamd@.service
[Unit]
Description=Generic ClamAV scanner daemon
Description=clamd scanner daemon
After=nss-lookup.target network.target
[Service]
Type=forking
ExecStart=/usr/sbin/clamd
Restart=on-failure
PrivateTmp=true
[Install]
WantedBy=multi-user.target

@ -7,3 +7,6 @@ Type=forking
ExecStart=/usr/sbin/clamd -c /etc/clamd%i.conf
Restart=on-failure
PrivateTmp=true
[Install]
WantedBy=multi-user.target

Binary file not shown.

@ -25,6 +25,7 @@ IUSE="test"
RDEPEND="
>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
dev-python/pyrfc3339[${PYTHON_USEDEP}]

@ -1,2 +1,2 @@
DIST cfssl-1.2.0_p20170601.tar.gz 8025105 BLAKE2B cc87451f23e5a495816980d65bd32f270f6982940368afed7d13591dd8c0d56665e666bc555abc4e0b2f5a5cfd997a18b8a6a9f757c9ea6ec62c82448de1b72d SHA512 f89d6b142eb5286b720c9d94534c474b15738c6a856999588392b37ffa753e0f0c9d663debee9cc216be765d8f39a71872401173a56293cdca2f2d1791c3d758
DIST cfssl-1.2.0_p20170915.tar.gz 8027590 BLAKE2B 5361a9ba7f08d3940aa5e27f65b55359871d85dcf8e4f21b6e59a9f3c9741490b16898e2001133742dfa1294927b0b322ffd5bdf836754851bed0c176bc710da SHA512 247ee892f7785ae11e8b2d38c1fdad0a3bcea9d9e410ce1bc985d15fad65b981c46e317cbb0fe0cacf190dfbbad7b9f8685f6ddd2a24056dd61e621b2cccd232
DIST cfssl-1.2.0_p20171207.tar.gz 8028127 BLAKE2B 35bb2b6fa08345dd6042742891cc0ad87ffac3cd24e8f16551e7e4e36b7f11caf4baafee961666ed95cf14e77cf4e24e11f7d8d85503abfc42a8fe3fbc2fe758 SHA512 d94f27bcc5f59fb2882f6db802baff9706461f1a823706810f7ab5911fcdd3abc9150060df0aa756478774cf3b5e06aec0b11cefce32ff3c6ff85948b8624356

@ -4,15 +4,14 @@
EAPI=6
EGO_PN="github.com/cloudflare/${PN}"
EGIT_COMMIT="9c06c53d4dfb9c0272c983a26ea10a6a2da12392"
EGIT_COMMIT="d2393674072314fda47d2c7c16cb7fd4cdc16821"
inherit golang-build golang-vcs-snapshot
ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
DESCRIPTION="Cloudflare's PKI and TLS toolkit"
HOMEPAGE="https://github.com/cloudflare/cfssl"
SRC_URI="${ARCHIVE_URI}"
LICENSE="BSD-2"
SLOT="0"
IUSE="hardened"
@ -22,9 +21,8 @@ RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
RESTRICT="test"
src_compile() {
export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
pushd src || die
GOPATH="${S}" go install github.com/cloudflare/cfssl/cmd/... || die
CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${S}" go install github.com/cloudflare/cfssl/cmd/... || die
popd || die
}

@ -1,2 +1,3 @@
DIST stoken-0.90.tar.gz 116642 BLAKE2B 33cde44212585eb994db62de0527fb7d06add3f247ac09e53ee3809de4150b09a99bdda1eb4bd1d7ac449a8f94c8dbdd468af955b82caeb1beb8331338788049 SHA512 7c75a04ea6542a13d639bbb74523443e030559dcf65d181d07fc64277442500a8a18daf2351248a552e42daf815fe5d0079b5b559402522d45ac10ed7762c818
DIST stoken-0.91.tar.gz 116846 BLAKE2B 914324f7151ff9aaae336cf44624f7d8fd70bfc0514a9c20defd47e17e8acceda2aa020a2fadfe3bdd9caa6650adb7859a5422eb9acc27df9834140f4bd5aa86 SHA512 7d34c3ec3022aabd909fcb89fabd03003fdc4d635a064401407ce78068c0965012b9b61b53ce2d6e018973fe2e23a7e4d35913fca564e0af65fd0f0fb7fb30b4
DIST stoken-0.92.tar.gz 117212 BLAKE2B 8d236a73b0626ab91d145d01fa07c28ba8c54a3053aaba32b64b4dacc39dc8265d5740630ec2495d678c975b1bfa480a79a5ec1115accf39170229b444673f48 SHA512 b41262320c24e487ece884fc431d835c787f057947a92e3d57ed2047bc02b576b072e8a69f4b58b47ab1f913b5ae8c3ee8108d3b55c1477f15848420b668fea3

@ -0,0 +1,30 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
inherit autotools
DESCRIPTION="Software Token for Linux/UNIX"
HOMEPAGE="https://github.com/cernekee/stoken"
SRC_URI="https://github.com/cernekee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="gtk"
# || ( dev-libs/nettle dev-libs/libtomcrypt ) libtomcrypt is not packaged
RDEPEND="
dev-libs/nettle
gtk? ( >=x11-libs/gtk+-3.12:3 )"
DEPEND="${RDEPEND}"
src_prepare() {
eautoreconf
eapply_user
}
src_configure() {
econf $(use_with gtk)
}

Binary file not shown.

@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="vim and gvim shared files"

@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Vim, an improved vi-style text editor"

Binary file not shown.

@ -11,7 +11,7 @@ SRC_URI="https://github.com/voxpupuli/puppet-mode/archive/${PV}.tar.gz -> ${P}.t
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86"
KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
DOCS="CHANGES.rst README.rst"
SITEFILE="50${PN}-1-gentoo.el"

Binary file not shown.

@ -14,7 +14,7 @@ SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 hppa ~ppc ppc64 x86"
KEYWORDS="amd64 hppa ~ppc ppc64 ~sparc x86"
IUSE=""
# db/expat req for legacytm (backwards support for pre 1.6)

@ -14,7 +14,7 @@ SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
# db/expat req for legacytm (backwards support for pre 1.6)

Binary file not shown.

@ -58,7 +58,7 @@ fi
LICENSE="MPL-1.1"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="insecure_certs"
${PRECOMPILED} || IUSE+=" cacert"

@ -22,7 +22,7 @@ RDEPEND="
sys-apps/dbus
introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
modemmanager? ( >=net-misc/modemmanager-1 )
zeroconf? ( >=net-dns/avahi-0.6.10 )
zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
!<sci-geosciences/geocode-glib-3.10.0
"
DEPEND="${RDEPEND}

@ -1,41 +0,0 @@
--- a/test/broker/Makefile 2016-02-14 14:36:55.000000000 +0000
+++ b/test/broker/Makefile 2016-05-05 09:53:30.548519257 +0100
@@ -63,11 +63,13 @@
./05-clean-session-qos1.py
06 :
+ifeq ($(WITH_BRIDGE),yes)
./06-bridge-reconnect-local-out.py
./06-bridge-br2b-disconnect-qos1.py
./06-bridge-br2b-disconnect-qos2.py
./06-bridge-b2br-disconnect-qos1.py
./06-bridge-b2br-disconnect-qos2.py
+endif
07 :
./07-will-qos0.py
@@ -85,10 +87,12 @@
./08-ssl-connect-cert-auth-crl.py
./08-ssl-connect-identity.py
./08-ssl-connect-no-identity.py
+ifeq ($(WITH_BRIDGE),yes)
./08-ssl-bridge.py
./08-tls-psk-pub.py
./08-tls-psk-bridge.py
endif
+endif
09 :
./09-plugin-auth-unpwd-success.py
--- a/test/broker/c/Makefile 2016-02-14 14:36:55.000000000 +0000
+++ b/test/broker/c/Makefile 2016-05-05 09:40:31.440608209 +0100
@@ -13,7 +13,9 @@
$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
08-tls-psk-bridge.test : 08-tls-psk-bridge.c
+ifeq ($(WITH_BRIDGE),yes)
$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
+endif
reallyclean : clean

@ -1,43 +0,0 @@
--- a/test/broker/Makefile 2016-06-02 22:20:22.000000000 +0100
+++ b/test/broker/Makefile 2016-07-08 14:17:33.772666865 +0100
@@ -63,6 +63,7 @@
./05-clean-session-qos1.py
06 :
+ifeq ($(WITH_BRIDGE),yes)
./06-bridge-reconnect-local-out.py
./06-bridge-br2b-disconnect-qos1.py
./06-bridge-br2b-disconnect-qos2.py
@@ -70,6 +71,7 @@
./06-bridge-b2br-disconnect-qos2.py
./06-bridge-fail-persist-resend-qos1.py
./06-bridge-fail-persist-resend-qos2.py
+endif
07 :
./07-will-qos0.py
@@ -87,10 +89,12 @@
./08-ssl-connect-cert-auth-crl.py
./08-ssl-connect-identity.py
./08-ssl-connect-no-identity.py
+ifeq ($(WITH_BRIDGE),yes)
./08-ssl-bridge.py
./08-tls-psk-pub.py
./08-tls-psk-bridge.py
endif
+endif
09 :
./09-plugin-auth-unpwd-success.py
--- a/test/broker/c/Makefile 2016-02-14 14:36:55.000000000 +0000
+++ b/test/broker/c/Makefile 2016-05-05 09:40:31.440608209 +0100
@@ -13,7 +13,9 @@
$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
08-tls-psk-bridge.test : 08-tls-psk-bridge.c
+ifeq ($(WITH_BRIDGE),yes)
$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
+endif
reallyclean : clean

@ -1,23 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="3"
DESCRIPTION="A text file colorizer using powerful regular expressions"
HOMEPAGE="http://supercat.nosredna.net"
SRC_URI="http://supercat.nosredna.net/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
src_configure() {
econf --with-system-directory="${EPREFIX}/etc/supercat"
}
src_install() {
emake DESTDIR="${D}" install || die "Install failed!"
dodoc ChangeLog || die
}

@ -9,7 +9,7 @@ SRC_URI="http://supercat.nosredna.net/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
KEYWORDS="amd64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
src_configure() {
econf --with-system-directory="${EPREFIX}/etc/supercat"

@ -35,10 +35,10 @@ src_test() {
}
src_install() {
newbin "${PN}.sh" "${PN}"
dosym "${PN}" "/usr/bin/${PN}txt"
newbashcomp "${PN}_completion" "${PN}.sh"
bashcomp_alias "${PN}.sh" "${PN}txt"
newbin "${PN}.sh" "${PN}cli"
dosym "${PN}cli" "/usr/bin/${PN}txt"
newbashcomp "${PN}_completion" "${PN}cli.sh"
bashcomp_alias "${PN}cli.sh" "${PN}txt"
einstalldocs
}

Binary file not shown.

@ -1,30 +0,0 @@
diff -Nru sqlbox-0.7.2.orig/configure.in sqlbox-0.7.2/configure.in
--- sqlbox-0.7.2.orig/configure.in 2009-05-19 17:08:35.000000000 +0200
+++ sqlbox-0.7.2/configure.in 2009-09-23 00:22:05.000000000 +0200
@@ -207,7 +207,7 @@
then
AC_CHECK_PROG(JADE, openjade, openjade, no)
else
- JADE = $OLDJADE
+ JADE=$OLDJADE
fi
AC_CHECK_PROG(JADETEX, jadetex, jadetex, no)
AC_CHECK_PROG(PDFJADETEX, pdfjadetex, pdfjadetex, no)
@@ -402,7 +402,7 @@
AC_MSG_RESULT($loc)
AC_CHECK_FILE("$loc/include/kannel/gw-config.h",
[CFLAGS="$CFLAGS -I$loc/include/kannel -I$loc/include/kannel";
- LDFLAGS="$LDFLAGS -L$loc/lib/kannel -lwap -lgwlib";
+ LIBS="$LIBS -L$loc/lib/kannel -lwap -lgwlib";
found=1
])
fi
@@ -417,7 +417,7 @@
AC_MSG_RESULT([$gw_version])
AC_MSG_CHECKING([Kannel libs])
if ! $GW_CONFIG --libs &>/dev/null ; then
- LDFLAGS="$LDFLAGS `$GW_CONFIG --libs`"
+ LIBS="$LIBS `$GW_CONFIG --libs`"
gw_libdir=`$GW_CONFIG --libs`
AC_MSG_RESULT([$gw_libdir])
fi

@ -1,84 +0,0 @@
diff -Naur sqlbox-0.7.2/gw/sqlbox_mssql.h sqlbox-0.7.2.new/gw/sqlbox_mssql.h
--- sqlbox-0.7.2/gw/sqlbox_mssql.h 2009-05-19 11:08:35.000000000 -0400
+++ sqlbox-0.7.2.new/gw/sqlbox_mssql.h 2009-09-16 11:23:03.000000000 -0400
@@ -46,7 +46,7 @@
void sql_save_msg(Msg *msg, Octstr *momt /*, Octstr smsbox_id */);
Msg *mssql_fetch_msg();
void sql_shutdown();
-struct server_type *sql_init_mssql(Cfg *cfg);
+struct server_type *sqlbox_init_mssql(Cfg *cfg);
#ifndef sqlbox_mssql_c
extern
#endif
diff -Naur sqlbox-0.7.2/gw/sqlbox_mysql.h sqlbox-0.7.2.new/gw/sqlbox_mysql.h
--- sqlbox-0.7.2/gw/sqlbox_mysql.h 2009-05-19 11:08:35.000000000 -0400
+++ sqlbox-0.7.2.new/gw/sqlbox_mysql.h 2009-09-16 11:23:03.000000000 -0400
@@ -48,7 +48,7 @@
void sql_save_msg(Msg *msg, Octstr *momt);
Msg *mysql_fetch_msg();
void sql_shutdown();
-struct server_type *sql_init_mysql(Cfg *cfg);
+struct server_type *sqlbox_init_mysql(Cfg *cfg);
#ifndef sqlbox_mysql_c
extern
#endif
diff -Naur sqlbox-0.7.2/gw/sqlbox_oracle.h sqlbox-0.7.2.new/gw/sqlbox_oracle.h
--- sqlbox-0.7.2/gw/sqlbox_oracle.h 2009-05-19 11:08:35.000000000 -0400
+++ sqlbox-0.7.2.new/gw/sqlbox_oracle.h 2009-09-16 11:23:03.000000000 -0400
@@ -52,7 +52,7 @@
void sql_save_msg(Msg *msg, Octstr *momt /*, Octstr smsbox_id */);
Msg *oracle_fetch_msg();
void sql_shutdown();
-struct server_type *sql_init_oracle(Cfg *cfg);
+struct server_type *sqlbox_init_oracle(Cfg *cfg);
#ifndef sqlbox_oracle_c
extern
#endif
diff -Naur sqlbox-0.7.2/gw/sqlbox_pgsql.h sqlbox-0.7.2.new/gw/sqlbox_pgsql.h
--- sqlbox-0.7.2/gw/sqlbox_pgsql.h 2009-05-19 11:08:35.000000000 -0400
+++ sqlbox-0.7.2.new/gw/sqlbox_pgsql.h 2009-09-16 11:23:03.000000000 -0400
@@ -44,7 +44,7 @@
void sql_save_msg(Msg *msg, Octstr *momt /*, Octstr smsbox_id */);
Msg *pgsql_fetch_msg();
void sql_shutdown();
-struct server_type *sql_init_pgsql(Cfg *cfg);
+struct server_type *sqlbox_init_pgsql(Cfg *cfg);
void sqlbox_configure_pgsql(Cfg* cfg);
#ifndef sqlbox_pgsql_c
extern
diff -Naur sqlbox-0.7.2/gw/sqlbox_sdb.h sqlbox-0.7.2.new/gw/sqlbox_sdb.h
--- sqlbox-0.7.2/gw/sqlbox_sdb.h 2009-05-19 11:08:35.000000000 -0400
+++ sqlbox-0.7.2.new/gw/sqlbox_sdb.h 2009-09-16 11:23:03.000000000 -0400
@@ -21,7 +21,7 @@
void sql_save_msg(Msg *msg, Octstr *momt );
Msg *sdb_fetch_msg();
void sql_shutdown();
-struct server_type *sql_init_sdb(Cfg *cfg);
+struct server_type *sqlbox_init_sdb(Cfg *cfg);
#ifndef sqlbox_sdb_c
extern
#endif
diff -Naur sqlbox-0.7.2/gw/sqlbox_sqlite3.h sqlbox-0.7.2.new/gw/sqlbox_sqlite3.h
--- sqlbox-0.7.2/gw/sqlbox_sqlite3.h 2009-05-19 11:08:35.000000000 -0400
+++ sqlbox-0.7.2.new/gw/sqlbox_sqlite3.h 2009-09-16 11:23:03.000000000 -0400
@@ -41,7 +41,7 @@
void sql_save_msg(Msg *msg, Octstr *momt );
Msg *sqlite3_fetch_msg();
void sql_shutdown();
-struct server_type *sql_init_sqlite3(Cfg *cfg);
+struct server_type *sqlbox_init_sqlite3(Cfg *cfg);
#ifndef sqlbox_sqlite3_c
extern
#endif
diff -Naur sqlbox-0.7.2/gw/sqlbox_sqlite.h sqlbox-0.7.2.new/gw/sqlbox_sqlite.h
--- sqlbox-0.7.2/gw/sqlbox_sqlite.h 2009-05-19 11:08:35.000000000 -0400
+++ sqlbox-0.7.2.new/gw/sqlbox_sqlite.h 2009-09-16 11:23:03.000000000 -0400
@@ -41,7 +41,7 @@
void sql_save_msg(Msg *msg, Octstr *momt );
Msg *sqlite_fetch_msg();
void sql_shutdown();
-struct server_type *sql_init_sqlite(Cfg *cfg);
+struct server_type *sqlbox_init_sqlite(Cfg *cfg);
#ifndef sqlbox_sqlite_c
extern
#endif

Binary file not shown.

@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
FONT_S="${S}/lib/fonts"
FONT_SUFFIX="ttf"
DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
HOMEPAGE="http://www.lyx.org/"
HOMEPAGE="https://www.lyx.org/"
SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${MY_P}.tar.xz
ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/${PV}/${MY_P}.tar.xz"

@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
FONT_S="${S}/lib/fonts"
FONT_SUFFIX="ttf"
DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
HOMEPAGE="http://www.lyx.org/"
HOMEPAGE="https://www.lyx.org/"
SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${MY_P}.tar.xz
ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.1/${MY_P}/${MY_P}.tar.xz"

@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
FONT_S="${S}/lib/fonts"
FONT_SUFFIX="ttf"
DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
HOMEPAGE="http://www.lyx.org/"
HOMEPAGE="https://www.lyx.org/"
SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/${MY_P}/${MY_P}.tar.xz"

@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
FONT_S="${S}/lib/fonts"
FONT_SUFFIX="ttf"
DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
HOMEPAGE="http://www.lyx.org/"
HOMEPAGE="https://www.lyx.org/"
SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/${MY_P}/${MY_P}.tar.xz"

Binary file not shown.

@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
IUSE="+blake2 bzip2 +gpg lzma +portage-postsync sha3 test"
MODULE_RDEPEND="

Binary file not shown.

@ -10,7 +10,7 @@ inherit autotools python-single-r1 readme.gentoo-r1
DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
HOMEPAGE="http://asciidoc.org/"
SRC_URI="https://github.com/asciidoc/asciidoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
LICENSE="GPL-2"
SLOT="0"

@ -0,0 +1 @@
DIST fictionup-0.1.tar.gz 322407 BLAKE2B 73b464b73f58d725a1973450c2ecb79e140d2a2a4f6a563ea9d5fc1c25ff417a98f487fd26f1c578234007ccb52902390e6292fd3f1b3ec0331a31d00e25e9c3 SHA512 375dbfb27cab05693197b0774875ebbafdb5c4a1bc67db318e00712b821d37fc647b5047fbca083ad145847aa61b81486e4f5192524c233d3facdec3447beb6e

@ -0,0 +1,20 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit cmake-utils
DESCRIPTION="A command-line markdown to fb2 convertor"
HOMEPAGE="http://cdslow.org.ru/fictionup/"
SRC_URI="http://cdslow.org.ru/files/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
IUSE=""
KEYWORDS="~amd64 ~x86"
DEPEND="dev-libs/libyaml"
RDEPEND="${DEPEND}"
src_install() {
cmake-utils_src_install
mv "${D}"usr/share/doc/${PN} "${D}"usr/share/doc/${PF} || die "doc mv failed"
}

@ -0,0 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grozin@gentoo.org</email>
<name>Andrey Grozin</name>
</maintainer>
<longdescription lang="en">
fictionup is a command-line markdown to fb2 convertor. Metadata can be
included in the input file as a yaml block or given by a command-line
argument.
</longdescription>
</pkgmetadata>

@ -1,44 +0,0 @@
Fix sgml and tex regex against perl-5.22. See Gentoo-bug: 604428.
Based on a patch from upstream git. Original commit info:
From 44e5c2f02b3166536257bc9d6384d41dda386648 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 28 Aug 2015 19:01:17 +0200
Subject: [PATCH] Port our regex to Perl 5.22 (patch by Roderich Schupp)
---
lib/Locale/Po4a/Sgml.pm | 4 ++--
lib/Locale/Po4a/TeX.pm | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/Locale/Po4a/Sgml.pm b/lib/Locale/Po4a/Sgml.pm
index 742e003..3ad5e8d 100644
--- a/lib/Locale/Po4a/Sgml.pm
+++ b/lib/Locale/Po4a/Sgml.pm
@@ -672,9 +672,9 @@ sub parse_file {
}
}
}
- $prolog =~ s/<!--{PO4A-ent-beg-(.*?)}(.*?){PO4A-ent-end}-->/<!ENTITY % $1 SYSTEM "$2">/g;
+ $prolog =~ s/<!--\{PO4A-ent-beg-(.*?)\}(.*?)\{PO4A-ent-end\}-->/<!ENTITY % $1 SYSTEM "$2">/g;
# Unprotect undefined inclusions, and die of them
- $prolog =~ s/{PO4A-percent}/%/sg;
+ $prolog =~ s/\{PO4A-percent\}/%/sg;
if ($prolog =~ /%([^;\s]*);/) {
die wrap_mod("po4a::sgml",
dgettext("po4a",
diff --git a/lib/Locale/Po4a/TeX.pm b/lib/Locale/Po4a/TeX.pm
index a78f94b..0faa465 100644
--- a/lib/Locale/Po4a/TeX.pm
+++ b/lib/Locale/Po4a/TeX.pm
@@ -1168,7 +1168,7 @@ sub parse {
# environment contains an un-closed bracket)
if ( ($closed and ($line =~ /^\s*$/ or
$line =~ /^\s*$RE_VERBATIM\s*$/))
- or (in_verbatim(@env) and $line =~ /^\s*\Q$ESCAPE\Eend{$env[-1]}\s*$/)
+ or (in_verbatim(@env) and $line =~ /^\s*\Q$ESCAPE\Eend\{$env[-1]\}\s*$/)
) {
# An empty line. This indicates the end of the current
# paragraph.
--
2.10.2

Binary file not shown.

@ -0,0 +1 @@
DIST frawor-0.2.3.tar.xz 257268 BLAKE2B 4409de0fb392841676eac2d794e0e44f64e3978dea1b72b807b7660a9feb1da3850a1ba651287f624830da4d1529daea60da2b76db37e422b6a4827e73dcf8d6 SHA512 ad8c6939875b5783b3faa0a3194e187161ba10f662a896f06ea86aebf12b172bd8d419b14a95c0d14aedfb38ebc5de73895d6d472db64dc15f567509e55188b2

@ -0,0 +1,16 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
DESCRIPTION="vim plugin: modular vim framework"
HOMEPAGE="https://bitbucket.org/ZyX_I/frawor"
SRC_URI="https://bitbucket.org/ZyX_I/${PN}/downloads/${P}.tar.xz"
LICENSE="vim"
KEYWORDS="~amd64 ~x86"
# Tests rely on zsh. No.
RESTRICT="test"

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>vim@gentoo.org</email>
<name>Gentoo Vim Project</name>
</maintainer>
<upstream>
<remote-id type="bitbucket">ZyX_I/frawor</remote-id>
</upstream>
</pkgmetadata>

Binary file not shown.

@ -0,0 +1 @@
DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95

@ -0,0 +1,36 @@
--- langkit-gps-src/langkit/templates/project_file.mako.old 2017-07-11 14:19:12.841221846 +0200
+++ langkit-gps-src/langkit/templates/project_file.mako 2017-07-11 14:12:39.104981170 +0200
@@ -82,9 +82,11 @@
for Default_Switches ("Ada") use
Common_Ada_Cargs & ("-g", "-O0", "-gnatwe", "-gnata");
- for Default_Switches ("C") use Common_C_Cargs & ("-g3", "-O0");
+ for Default_Switches ("C") use Common_C_Cargs &
+ ("-g3", "-O0", "-fPIC");
- for Switches ("quex_lexer.c") use Common_C_Cargs & ("-g0", "-O0");
+ for Switches ("quex_lexer.c") use Common_C_Cargs &
+ ("-g0", "-O0", "-fPIC");
-- This file is *huge* and the debugging information for it harms
-- Valgrind runs. We almost never have to debug this file so
-- this is acceptable.
@@ -111,6 +111,7 @@
-- ... and this prevents OOM on other platforms
end case;
end case;
+ for Driver ("C") use External ("GCC", "gcc");
end Compiler;
package Binder is
--- langkit-gps-src/langkit/compile_context.py.old 2017-12-13 22:12:38.689143125 +0100
+++ langkit-gps-src/langkit/compile_context.py 2017-12-13 22:13:02.446737994 +0100
@@ -1171,8 +1171,7 @@
# the Quex specification changed from last build.
if generate_lexer and self.cache.is_stale('quex_specification',
quex_spec):
- quex_py_file = path.join(os.environ["QUEX_PATH"], "quex-exe.py")
- subprocess.check_call([sys.executable, quex_py_file, "-i",
+ subprocess.check_call(["quex", "-i",
quex_file,
"-o", "quex_lexer",
"--buffer-element-size", "4",

@ -0,0 +1,45 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit python-single-r1
MYPN=${PN}-gps-src
DESCRIPTION="A Python framework to generate language parsers"
HOMEPAGE="https://www.adacore.com/community"
SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044
-> ${MYPN}-${PV}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}
dev-ada/gnatcoll[gnat_2017,iconv,shared]
dev-python/mako
dev-python/pyyaml
dev-python/enum34
dev-python/funcy
dev-python/docutils
dev-python/quex"
RDEPEND="${DEPEND}"
S="${WORKDIR}"/${MYPN}
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_test() {
testsuite/testsuite.py | grep FAILED && die "Test failed"
}
src_install() {
default
python_domodule langkit
python_doscript scripts/create-project.py
}

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tupone@gentoo.org</email>
<name>Tupone Alfredo</name>
</maintainer>
<longdescription lang="en">
Langkit (nickname for language kit) is a tool whose purpose is to make
it easy to create syntactic and semantic analysis engines. Write a
language specification in our Python DSL and Langkit will generate for
you an Ada library with bindings for the C and Python programming
languages.
The generated library is meant to provide a basis to write tooling,
including tools working on potentially changing and incorrect code,
such as IDEs.
</longdescription>
</pkgmetadata>

@ -1,2 +1 @@
DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95
DIST libadalang-2017-src.tar.gz 1862217 BLAKE2B 58f72726285e56a15278e85902fabf988327ea86a08cc6c86271d61075a6b19a0bffa86e5302f5c32e6d35ef95473ad747853b14899a12d09d49d656f4e6559e SHA512 c8663a7214c3c1dd73a6589a6db10d219fcd2db39ba2ce184eea85272c5f206ab0aa8d13b0e19b08a5996906c7fbddd479795363ec22e889dfceda9967c346c7

@ -1,27 +1,5 @@
--- work/langkit-gps-src/langkit/templates/project_file.mako.old 2017-07-11 14:19:12.841221846 +0200
+++ work/langkit-gps-src/langkit/templates/project_file.mako 2017-07-11 14:12:39.104981170 +0200
@@ -82,9 +82,9 @@
for Default_Switches ("Ada") use
Common_Ada_Cargs & ("-g", "-O0", "-gnatwe", "-gnata");
- for Default_Switches ("C") use Common_C_Cargs & ("-g3", "-O0");
+ for Default_Switches ("C") use Common_C_Cargs & ("-g3", "-O0", "-fPIC");
- for Switches ("quex_lexer.c") use Common_C_Cargs & ("-g0", "-O0");
+ for Switches ("quex_lexer.c") use Common_C_Cargs & ("-g0", "-O0", "-fPIC");
-- This file is *huge* and the debugging information for it harms
-- Valgrind runs. We almost never have to debug this file so
-- this is acceptable.
@@ -111,6 +111,7 @@
-- ... and this prevents OOM on other platforms
end case;
end case;
+ for Driver ("C") use External ("GCC", "gcc");
end Compiler;
package Binder is
--- work/libadalang-gps-src/ada/testsuite/testsuite_support/capi_driver.py 2017-07-30 16:01:31.495287196 +0200
+++ work/libadalang-gps-src/ada/testsuite/testsuite_support/capi_driver.py.old 2017-07-30 16:00:08.104464440 +0200
--- libadalang-gps-src/ada/testsuite/testsuite_support/capi_driver.py 2017-07-30 16:01:31.495287196 +0200
+++ libadalang-gps-src/ada/testsuite/testsuite_support/capi_driver.py.old 2017-07-30 16:00:08.104464440 +0200
@@ -72,6 +72,7 @@
-- different default standard.
@ -30,15 +8,3 @@
end Compiler;
end P;
'''.format(main_source=compile_units[0],
--- work/langkit-gps-src/langkit/compile_context.py.old 2017-12-13 22:12:38.689143125 +0100
+++ work/langkit-gps-src/langkit/compile_context.py 2017-12-13 22:13:02.446737994 +0100
@@ -1171,8 +1171,7 @@
# the Quex specification changed from last build.
if generate_lexer and self.cache.is_stale('quex_specification',
quex_spec):
- quex_py_file = path.join(os.environ["QUEX_PATH"], "quex-exe.py")
- subprocess.check_call([sys.executable, quex_py_file, "-i",
+ subprocess.check_call(["quex", "-i",
quex_file,
"-o", "quex_lexer",
"--buffer-element-size", "4",

@ -10,9 +10,7 @@ inherit python-single-r1
DESCRIPTION="high performance semantic engine for the Ada programming language"
HOMEPAGE="https://libre.adacore.com/"
SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed042
-> ${P}-src.tar.gz
http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044
-> langkit-gps-src-${PV}.tar.gz"
-> ${P}-src.tar.gz"
LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
SLOT="0"
@ -23,32 +21,26 @@ RDEPEND="dev-python/pyyaml
${PYTHON_DEPS}"
DEPEND="${RDEPEND}
dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=]
dev-python/docutils
dev-python/mako
dev-python/enum34
dev-python/quex
dev-python/funcy"
dev-ada/langkit"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
^^ ( gnat_2016 gnat_2017 )"
S="${WORKDIR}"
S="${WORKDIR}"/${PN}-gps-src
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_prepare() {
default
rm -r ${PN}-gps-src/ada/testsuite/tests/{acats_parse,stylechecks} || die
rm -r ada/testsuite/tests/{acats_parse,stylechecks} || die
}
src_compile() {
cd ${PN}-gps-src
PYTHONPATH=${PYTHONPATH}:"${WORKDIR}"/langkit-gps-src \
GCC=${CHOST}-gcc-4.9.4 ada/manage.py make || die
}
src_test () {
local myDir="${WORKDIR}"/${PN}-gps-src
cd ${PN}-gps-src/ada/testsuite
cd ada/testsuite
ln -sf "${myDir}"/build/include/libadalang.h c_support/libadalang.h
#./testsuite.py --show-error-output |& grep FAILED && die "Test failed"
GPR_PROJECT_PATH="${myDir}"/build/lib/gnat \
@ -60,8 +52,6 @@ src_test () {
}
src_install () {
cd ${PN}-gps-src
PYTHONPATH=${PYTHONPATH}:"${WORKDIR}"/langkit-gps-src \
ada/manage.py install "${D}"usr
python_domodule build/python/libadalang.py
}

Binary file not shown.

@ -18,6 +18,10 @@ IUSE="test"
RDEPEND=""
DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
PATCHES=(
"${FILESDIR}/${P}-use_system_catch-636828.patch"
)
src_configure() {
local mycmakeargs=( -DGSL_TEST=$(usex test) )
cmake-utils_src_configure

@ -12,7 +12,7 @@ SRC_URI="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${PV}.tar.
LICENSE="|| ( LGPL-3 Apache-2.0 )"
SLOT="0"
KEYWORDS="amd64 hppa ~ppc ppc64 x86"
KEYWORDS="amd64 hppa ~ppc ppc64 ~sparc x86"
IUSE="debug"
DEPEND="dev-libs/boost:="

Binary file not shown.

@ -1,4 +1,7 @@
DIST aerospike-server-community-3.13.0.7-debian7.tgz 10658707 BLAKE2B 0c254ed314adee2b625bad7aa5a96dfcd87f25cc053a22a38da7fa796fc734d3b2a551c990cb45c0ac2bc7b0459ca57a8aa5c15f54fe45ee75d2005b29ed07e3 SHA512 1dfe2fc52c7870f6c4bfbe26cb718cad7725c1362886c4ed30fed04ac40a692eedab47f03ce70fd2a4bc52a9df92ec08683eec24a1fa62a5674530272c705409
DIST aerospike-server-community-3.13.0.8-debian7.tgz 10659161 BLAKE2B 845b752a2071b6a9a0502a3bc63f15db836fc0615103ce27b0a81c11a808f1b7423dcd84bf8d3584738c273e3756a6cf155b0a9bea73a79511ec5ea5a5243f0a SHA512 70ec34a1832659918c21f08de4968c4e237aa5dc43f07135dd4cfc49d4107de08418f6dadbf07a375b39e1f5e8dc5e156e56428818a4327001e03b75a7bc0038
DIST aerospike-server-community-3.14.1.4-debian7.tgz 10451324 BLAKE2B 59cd0531efb5c45418a1d80ee1eb6b47b281c23b1fc9f2685053fd556a3ca385db216b713be283cf6ccb199ed45c892d5940c1ca87b1c4d6c113b63fe3ea5cd2 SHA512 737c8e2e64d4738d97f1abe4199c4fbc5c00f4c967da3cf6ebbe6e77e416d40ec4c431cf3aec1b9dd4d6388efc0268220b5717924c7083631582899a2d3b6402
DIST aerospike-server-community-3.14.1.5-debian7.tgz 10451650 BLAKE2B 1b043893094fd843f459e31af7be2818e54697e32dea7338842876bc88deb6a649d8275892b5eb54c1613e52a8bad153e676fbf258afeb5f4e76aed881d16494 SHA512 3b7bb44ba8ce9b9b643067c0c33e1d154dd760096df3d2629ffb7dc6b1c04002b54d771d9cf0303c78e102c6a12a882edd0a689395a8bf55518e23dbf36aea8e
DIST aerospike-server-community-3.15.0.1-debian7.tgz 10299283 BLAKE2B 197c8acc0f27c0c5019416e29ed8611b8021d29f5104ca23e06707e2d1fc276f7d86c0a66a0e1395b4d3e286ce4e834c80fcbbcc224b9ac11ac114a91e0a51f4 SHA512 a68c6ce094176bf944baef551553a526581718757967f5f06a7bb02cb81eef923a86db6310f20a3380923ca65d8f31a6785251b7aaacca318c3dc9d6987eaaec
DIST aerospike-server-community-3.15.0.2-debian7.tgz 10299075 BLAKE2B 86b755fef6b0fe9e1736584d38e3e9b9ec46f661698ec9643c507605a0252725fea971a46ba2f25a302961c2916b4e21a8d76c8ae8a1a76b3e9a06f30d4fdc74 SHA512 6aae04d81ff9a56e2283186b8a38947b9a30cd2ed97ea4613a9eecd89912ec31695a959f25fc0b06b2cac13c1aaf1c46366cf3967f776a515196e2a2e5dbe431
DIST aerospike-server-community-3.15.1.3-debian7.tgz 9774757 BLAKE2B bf050897c8ed862155c80844035af39efb04f5875e49593412f3735465e6ddb1eb24cb7a3734c158041ac2e42f54ddc0cbd54ce0019e306b2297fa83d9a6f276 SHA512 67b57814f3a2c950b41952a45a9b3e56739397084af295dccdb364f79dec3e4db717a1e3b4569e920dfac76352f4214c5178bc6f780a60fec6689b1fdff01f4a

@ -0,0 +1,71 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils user
DESCRIPTION="Flash-optimized, in-memory, nosql database"
HOMEPAGE="http://www.aerospike.com"
SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
RDEPEND="sys-libs/readline
sys-libs/zlib
dev-libs/openssl
"
DEPEND="${RDEPEND}"
S="${WORKDIR}/${P}-debian7"
pkg_setup() {
enewgroup aerospike
enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
}
src_prepare() {
local server_deb="${P}.debian7.x86_64.deb"
local tools_deb="aerospike-tools-3.13.0.1.debian7.x86_64.deb"
ar x "${server_deb}" || die
tar xzf data.tar.gz && rm data.tar.gz || die
ar x "${tools_deb}" || die
tar xzf data.tar.gz && rm data.tar.gz || die
rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
rm usr/bin/{asfixownership,asmigrate2to3}
}
src_install() {
insinto /opt/
doins -r opt/aerospike
fperms +x -R /opt/aerospike/bin/
fperms +x -R /opt/aerospike/lib/python/
for dir in '/etc' '/var/log'; do
keepdir "${dir}/aerospike"
done
insinto /etc/aerospike
for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
doins "${FILESDIR}/${conf}"
done
insinto /usr/bin
doins usr/bin/*
fperms +x -R /usr/bin/asd
insinto /etc/logrotate.d
newins "${FILESDIR}"/aerospike.logrotate aerospike
newinitd "${FILESDIR}"/aerospike.init aerospike
fowners -R aerospike:aerospike /opt/aerospike/
fowners aerospike:aerospike /usr/bin/asd
fowners -R aerospike:aerospike /var/log/aerospike
}

@ -0,0 +1,71 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils user
DESCRIPTION="Flash-optimized, in-memory, nosql database"
HOMEPAGE="http://www.aerospike.com"
SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
RDEPEND="sys-libs/readline
sys-libs/zlib
dev-libs/openssl
"
DEPEND="${RDEPEND}"
S="${WORKDIR}/${P}-debian7"
pkg_setup() {
enewgroup aerospike
enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
}
src_prepare() {
local server_deb="${P}.debian7.x86_64.deb"
local tools_deb="aerospike-tools-3.13.0.1.debian7.x86_64.deb"
ar x "${server_deb}" || die
tar xzf data.tar.gz && rm data.tar.gz || die
ar x "${tools_deb}" || die
tar xzf data.tar.gz && rm data.tar.gz || die
rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
rm usr/bin/{asfixownership,asmigrate2to3}
}
src_install() {
insinto /opt/
doins -r opt/aerospike
fperms +x -R /opt/aerospike/bin/
fperms +x -R /opt/aerospike/lib/python/
for dir in '/etc' '/var/log'; do
keepdir "${dir}/aerospike"
done
insinto /etc/aerospike
for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
doins "${FILESDIR}/${conf}"
done
insinto /usr/bin
doins usr/bin/*
fperms +x -R /usr/bin/asd
insinto /etc/logrotate.d
newins "${FILESDIR}"/aerospike.logrotate aerospike
newinitd "${FILESDIR}"/aerospike.init aerospike
fowners -R aerospike:aerospike /opt/aerospike/
fowners aerospike:aerospike /usr/bin/asd
fowners -R aerospike:aerospike /var/log/aerospike
}

@ -0,0 +1,71 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils user
DESCRIPTION="Flash-optimized, in-memory, nosql database"
HOMEPAGE="http://www.aerospike.com"
SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
RDEPEND="sys-libs/readline
sys-libs/zlib
dev-libs/openssl
"
DEPEND="${RDEPEND}"
S="${WORKDIR}/${P}-debian7"
pkg_setup() {
enewgroup aerospike
enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
}
src_prepare() {
local server_deb="${P}.debian7.x86_64.deb"
local tools_deb="aerospike-tools-3.15.1.2.debian7.x86_64.deb"
ar x "${server_deb}" || die
tar xzf data.tar.gz && rm data.tar.gz || die
ar x "${tools_deb}" || die
tar xzf data.tar.gz && rm data.tar.gz || die
rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
rm usr/bin/{asfixownership,asmigrate2to3}
}
src_install() {
insinto /opt/
doins -r opt/aerospike
fperms +x -R /opt/aerospike/bin/
fperms +x -R /opt/aerospike/lib/python/
for dir in '/etc' '/var/log'; do
keepdir "${dir}/aerospike"
done
insinto /etc/aerospike
for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
doins "${FILESDIR}/${conf}"
done
insinto /usr/bin
doins usr/bin/*
fperms +x -R /usr/bin/asd
insinto /etc/logrotate.d
newins "${FILESDIR}"/aerospike.logrotate aerospike
newinitd "${FILESDIR}"/aerospike.init aerospike
fowners -R aerospike:aerospike /opt/aerospike/
fowners aerospike:aerospike /usr/bin/asd
fowners -R aerospike:aerospike /var/log/aerospike
}

@ -1,4 +1,3 @@
DIST etcd-2.3.8.tar.gz 2206562 BLAKE2B 754930b4b5f0e90386b2b4765a9dbb6790ae509a81d3430c3f7c2c828d90318db3b01a2faea0c7075078096ce74302f2be7444245047534749f49d13a927851e SHA512 4268de32797cab23e9e47784d31d5abd6982068c53d3cc9735a06719740dba45b73f4e067cbc7aa8aef5ca7c56d8be067f1076685ac82f64012b760d8b7f2bfc
DIST etcd-3.2.10.tar.gz 3016954 BLAKE2B d957914e2bb14219531f4d44e01150045c92b27afbf2a3f1a6b09a2a97771c1ae9822925e69feacd2f761f6b0a8e3a2cf09adb3f2783d7f80cea5f9fd8d7cd67 SHA512 6d00bd47b8c76332e4d1eaa12d8db6052c19bad5e99402860875ba1d6590e0b4aa1afc7cfeb25128125d0195c408c5f4d782b75a0132fc6a8f5cfff673faab75
DIST etcd-3.2.11.tar.gz 3016255 BLAKE2B b57d70ab50e9b8c7bf11920c0bf18789975af7f4f1d66b0afb17ba1d4830250972ba2e276de4d67b80bec317cf9d35eac7f63f8ca7c7c25fce2947807dcc42f8 SHA512 e0a71d43d6595c0a08a6068addcf13c98d3d8bd6873c9b5ac39b6183daea34191c1b81a2c81f5c7ec98d587c85f3b1af8cd584d7a0857668f77fb80151858fdb
DIST etcd-3.2.9.tar.gz 2889569 BLAKE2B 27f2e7db1518317484f850bbc5f350adc249c90423efc9379f69050ac0300ce687ef5eeb804520ddd577594080c5bffc0e32eba12edfa8b49775aa4861946647 SHA512 c194365e388fda8f796af70ff4b575b6ccabac0ca9ae3d84d55718e3914b927d5a6ba10b48eddc897139918880fcfa29d7a329463d20ce72f62115a0a41b6d4d
DIST etcd-3.2.12.tar.gz 3046578 BLAKE2B 7b7a071c6856a7f1b5b7ceb68a4efbac74fde6ed1211dabda7d715ea79cd4dc9c10b0f1345d70b8a21e52cb3ac6adfc37c232ea28ff88e5f401212b5a8610d73 SHA512 b672a35ba62efccffa09be6b3d2a84b99e8abcae87093539c705d82e13c0f985a9f07a3d885af7386595f12d433756176db107739749c301e7e5d096e85d018b

@ -49,7 +49,7 @@ src_install() {
newins "${FILESDIR}/${PN}.logrotated" "${PN}"
dodir /var/lib/${PN}
fowners ${PN}:${PN} /var/lib/${PN}
fperms 755 /var/lib/${PN}
fperms 0700 /var/lib/${PN}
dodir /var/log/${PN}
fowners ${PN}:${PN} /var/log/${PN}
fperms 755 /var/log/${PN}

@ -1,63 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit user systemd golang-vcs-snapshot
KEYWORDS="~amd64"
EGO_PN="github.com/coreos/etcd"
DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
HOMEPAGE="https://github.com/coreos/etcd"
SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="doc"
DEPEND=">=dev-lang/go-1.8:="
RDEPEND="!dev-db/etcdctl"
src_prepare() {
default
sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
-i "${S}"/src/${EGO_PN}/build || die
}
pkg_setup() {
enewgroup ${PN}
enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
}
src_compile() {
export GOPATH=${S}
pushd src/${EGO_PN} || die
./build || die
popd || die
}
src_install() {
pushd src/${EGO_PN} || die
insinto /etc/${PN}
doins "${FILESDIR}/${PN}.conf"
dobin bin/*
dodoc README.md
use doc && dodoc -r Documentation
systemd_dounit "${FILESDIR}/${PN}.service"
systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
newinitd "${FILESDIR}"/${PN}.initd ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}.logrotated" "${PN}"
dodir /var/lib/${PN}
fowners ${PN}:${PN} /var/lib/${PN}
fperms 755 /var/lib/${PN}
dodir /var/log/${PN}
fowners ${PN}:${PN} /var/log/${PN}
fperms 755 /var/log/${PN}
popd || die
}
src_test() {
pushd src/${EGO_PN} || die
./test || die
popd || die
}

@ -1,35 +0,0 @@
--- SConstruct.orig 2015-02-05 16:33:41.000000000 +0000
+++ SConstruct 2015-02-18 08:21:23.120134258 +0000
@@ -1008,7 +1008,6 @@
# -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
env.Append( CCFLAGS=["-fPIC",
"-fno-strict-aliasing",
- "-ggdb",
"-pthread",
"-Wall",
"-Wsign-compare",
@@ -1016,13 +1015,13 @@
"-Winvalid-pch"] )
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
if linux or darwin:
- env.Append( CCFLAGS=["-pipe"] )
if not has_option("disable-warnings-as-errors"):
env.Append( CCFLAGS=["-Werror"] )
env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
# SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
# startup.
@@ -1039,7 +1038,7 @@
if not darwin:
env.Append( LINKFLAGS=["-rdynamic"] )
- env.Append( LIBS=[] )
+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
#make scons colorgcc friendly
for key in ('HOME', 'TERM'):

@ -1,302 +0,0 @@
From 9df9837299ab952d4d30db2427beef667e608f79 Mon Sep 17 00:00:00 2001
From: Steven Green <steven@greenius.co.uk>
Date: Mon, 17 Jul 2017 13:05:44 +0100
Subject: [PATCH] SERVER-30166 Replace string with explicit std::string.
Enables compulation when using --use-system-pcre which presusably used to do
'using std::string' in an earlier version of pcre
https://github.com/mongodb/mongo/pull/1166
---
src/mongo/db/dbwebserver.cpp | 1 +
src/mongo/db/matcher/expression_leaf.cpp | 4 ++--
src/mongo/db/repl/master_slave.cpp | 40 ++++++++++++++++----------------
src/mongo/shell/bench.cpp | 14 +++++------
src/mongo/util/net/miniwebserver.cpp | 1 +
5 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/src/mongo/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp
index b202e0500b9..02556135240 100644
--- a/src/mongo/db/dbwebserver.cpp
+++ b/src/mongo/db/dbwebserver.cpp
@@ -67,6 +67,7 @@ namespace mongo {
using std::map;
using std::stringstream;
using std::vector;
+using std::string;
using namespace html;
diff --git a/src/mongo/db/matcher/expression_leaf.cpp b/src/mongo/db/matcher/expression_leaf.cpp
index d562bff141e..b96a36d543f 100644
--- a/src/mongo/db/matcher/expression_leaf.cpp
+++ b/src/mongo/db/matcher/expression_leaf.cpp
@@ -202,7 +202,7 @@ void ComparisonMatchExpression::debugString(StringBuilder& debug, int level) con
}
void ComparisonMatchExpression::serialize(BSONObjBuilder* out) const {
- string opString = "";
+ std::string opString = "";
switch (matchType()) {
case LT:
opString = "$lt";
@@ -884,7 +884,7 @@ void BitTestMatchExpression::debugString(StringBuilder& debug, int level) const
}
void BitTestMatchExpression::serialize(BSONObjBuilder* out) const {
- string opString = "";
+ std::string opString = "";
switch (matchType()) {
case BITS_ALL_SET:
diff --git a/src/mongo/db/repl/master_slave.cpp b/src/mongo/db/repl/master_slave.cpp
index 05faad12599..042350465c6 100644
--- a/src/mongo/db/repl/master_slave.cpp
+++ b/src/mongo/db/repl/master_slave.cpp
@@ -168,7 +168,7 @@ BSONObj ReplSource::jsobj() {
BSONObjBuilder dbsNextPassBuilder;
int n = 0;
- for (set<string>::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) {
+ for (set<std::string>::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) {
n++;
dbsNextPassBuilder.appendBool(*i, 1);
}
@@ -177,7 +177,7 @@ BSONObj ReplSource::jsobj() {
BSONObjBuilder incompleteCloneDbsBuilder;
n = 0;
- for (set<string>::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) {
+ for (set<std::string>::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) {
n++;
incompleteCloneDbsBuilder.appendBool(*i, 1);
}
@@ -188,7 +188,7 @@ BSONObj ReplSource::jsobj() {
}
void ReplSource::ensureMe(OperationContext* txn) {
- string myname = getHostName();
+ std::string myname = getHostName();
// local.me is an identifier for a server for getLastError w:2+
bool exists = Helpers::getSingleton(txn, "local.me", _me);
@@ -378,10 +378,10 @@ class HandshakeCmd : public Command {
}
virtual bool run(OperationContext* txn,
- const string& ns,
+ const std::string& ns,
BSONObj& cmdObj,
int options,
- string& errmsg,
+ std::string& errmsg,
BSONObjBuilder& result) {
HandshakeArgs handshake;
Status status = handshake.initialize(cmdObj);
@@ -398,7 +398,7 @@ class HandshakeCmd : public Command {
} handshakeCmd;
bool replHandshake(DBClientConnection* conn, const OID& myRID) {
- string myname = getHostName();
+ std::string myname = getHostName();
BSONObjBuilder cmd;
cmd.append("handshake", myRID);
@@ -450,7 +450,7 @@ void ReplSource::forceResync(OperationContext* txn, const char* requester) {
BSONElement e = i.next();
if (e.eoo())
break;
- string name = e.embeddedObject().getField("name").valuestr();
+ std::string name = e.embeddedObject().getField("name").valuestr();
if (!e.embeddedObject().getBoolField("empty")) {
if (name != "local") {
if (only.empty() || only == name) {
@@ -481,7 +481,7 @@ Status ReplSource::_updateIfDoneWithInitialSync() {
return Status::OK();
}
-void ReplSource::resyncDrop(OperationContext* txn, const string& dbName) {
+void ReplSource::resyncDrop(OperationContext* txn, const std::string& dbName) {
log() << "resync: dropping database " << dbName;
invariant(txn->lockState()->isW());
@@ -531,13 +531,13 @@ void ReplSource::resync(OperationContext* txn, const std::string& dbName) {
static DatabaseIgnorer ___databaseIgnorer;
-void DatabaseIgnorer::doIgnoreUntilAfter(const string& db, const Timestamp& futureOplogTime) {
+void DatabaseIgnorer::doIgnoreUntilAfter(const std::string& db, const Timestamp& futureOplogTime) {
if (futureOplogTime > _ignores[db]) {
_ignores[db] = futureOplogTime;
}
}
-bool DatabaseIgnorer::ignoreAt(const string& db, const Timestamp& currentOplogTime) {
+bool DatabaseIgnorer::ignoreAt(const std::string& db, const Timestamp& currentOplogTime) {
if (_ignores[db].isNull()) {
return false;
}
@@ -627,7 +627,7 @@ bool ReplSource::handleDuplicateDbName(OperationContext* txn,
// The database is present on the master and no conflicting databases
// are present on the master. Drop any local conflicts.
- for (set<string>::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) {
+ for (set<std::string>::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) {
___databaseIgnorer.doIgnoreUntilAfter(*i, lastTime);
incompleteCloneDbs.erase(*i);
addDbNextPass.erase(*i);
@@ -826,10 +826,10 @@ void ReplSource::_sync_pullOpLog_applyOperation(OperationContext* txn,
}
void ReplSource::syncToTailOfRemoteLog() {
- string _ns = ns();
+ std::string _ns = ns();
BSONObjBuilder b;
if (!only.empty()) {
- b.appendRegex("ns", string("^") + pcrecpp::RE::QuoteMeta(only));
+ b.appendRegex("ns", std::string("^") + pcrecpp::RE::QuoteMeta(only));
}
BSONObj last = oplogReader.findOne(_ns.c_str(), Query(b.done()).sort(BSON("$natural" << -1)));
if (!last.isEmpty()) {
@@ -877,7 +877,7 @@ class ReplApplyBatchSize
*/
int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) {
int okResultCode = restartSyncAfterSleep;
- string ns = string("local.oplog.$") + sourceName();
+ std::string ns = std::string("local.oplog.$") + sourceName();
LOG(2) << "sync_pullOpLog " << ns << " syncedTo:" << syncedTo.toStringLong() << '\n';
bool tailing = true;
@@ -897,7 +897,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) {
BSONElement e = i.next();
if (e.eoo())
break;
- string name = e.embeddedObject().getField("name").valuestr();
+ std::string name = e.embeddedObject().getField("name").valuestr();
if (!e.embeddedObject().getBoolField("empty")) {
if (name != "local") {
if (only.empty() || only == name) {
@@ -921,7 +921,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) {
if (!only.empty()) {
// note we may here skip a LOT of data table scanning, a lot of work for the master.
// maybe append "\\." here?
- query.appendRegex("ns", string("^") + pcrecpp::RE::QuoteMeta(only));
+ query.appendRegex("ns", std::string("^") + pcrecpp::RE::QuoteMeta(only));
}
BSONObj queryObj = query.done();
// e.g. queryObj = { ts: { $gte: syncedTo } }
@@ -940,7 +940,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) {
// show any deferred database creates from a previous pass
{
- set<string>::iterator i = addDbNextPass.begin();
+ set<std::string>::iterator i = addDbNextPass.begin();
if (i != addDbNextPass.end()) {
BSONObjBuilder b;
b.append("ns", *i + '.');
@@ -984,7 +984,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) {
BSONObj op = oplogReader.nextSafe();
BSONElement ts = op.getField("ts");
if (ts.type() != Date && ts.type() != bsonTimestamp) {
- string err = op.getStringField("$err");
+ std::string err = op.getStringField("$err");
if (!err.empty()) {
// 13051 is "tailable cursor requested on non capped collection"
if (op.getIntField("code") == 13051) {
@@ -1152,7 +1152,7 @@ int ReplSource::sync(OperationContext* txn, int& nApplied) {
// FIXME Handle cases where this db isn't on default port, or default port is spec'd in
// hostName.
- if ((string("localhost") == hostName || string("127.0.0.1") == hostName) &&
+ if ((std::string("localhost") == hostName || std::string("127.0.0.1") == hostName) &&
serverGlobalParams.port == ServerGlobalParams::DefaultDBPort) {
log() << "can't sync from self (localhost). sources configuration may be wrong." << endl;
sleepsecs(5);
@@ -1297,7 +1297,7 @@ static void replMain(OperationContext* txn) {
if (s) {
stringstream ss;
ss << "sleep " << s << " sec before next pass";
- string msg = ss.str();
+ std::string msg = ss.str();
if (!serverGlobalParams.quiet)
log() << msg << endl;
ReplInfo r(msg.c_str());
diff --git a/src/mongo/shell/bench.cpp b/src/mongo/shell/bench.cpp
index 040002f5c6e..338477ebe56 100644
--- a/src/mongo/shell/bench.cpp
+++ b/src/mongo/shell/bench.cpp
@@ -674,7 +674,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {
invariant(bsonTemplateEvaluator.setId(_id) == BsonTemplateEvaluator::StatusSuccess);
if (_config->username != "") {
- string errmsg;
+ std::string errmsg;
if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
uasserted(15931, "Authenticating to connection for _benchThread failed: " + errmsg);
}
@@ -918,7 +918,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {
if (!result["err"].eoo() && result["err"].type() == String &&
(_config->throwGLE || op.throwGLE))
- throw DBException((string) "From benchRun GLE" +
+ throw DBException((std::string) "From benchRun GLE" +
causedBy(result["err"].String()),
result["code"].eoo() ? 0 : result["code"].Int());
}
@@ -984,7 +984,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {
if (!result["err"].eoo() && result["err"].type() == String &&
(_config->throwGLE || op.throwGLE))
- throw DBException((string) "From benchRun GLE" +
+ throw DBException((std::string) "From benchRun GLE" +
causedBy(result["err"].String()),
result["code"].eoo() ? 0 : result["code"].Int());
}
@@ -1031,7 +1031,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {
if (!result["err"].eoo() && result["err"].type() == String &&
(_config->throwGLE || op.throwGLE))
- throw DBException((string) "From benchRun GLE " +
+ throw DBException((std::string) "From benchRun GLE " +
causedBy(result["err"].String()),
result["code"].eoo() ? 0 : result["code"].Int());
}
@@ -1133,7 +1133,7 @@ void BenchRunWorker::run() {
try {
std::unique_ptr<DBClientBase> conn(_config->createConnection());
if (!_config->username.empty()) {
- string errmsg;
+ std::string errmsg;
if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
uasserted(15932, "Authenticating to connection for benchThread failed: " + errmsg);
}
@@ -1165,7 +1165,7 @@ void BenchRunner::start() {
std::unique_ptr<DBClientBase> conn(_config->createConnection());
// Must authenticate to admin db in order to run serverStatus command
if (_config->username != "") {
- string errmsg;
+ std::string errmsg;
if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
uasserted(
16704,
@@ -1201,7 +1201,7 @@ void BenchRunner::stop() {
{
std::unique_ptr<DBClientBase> conn(_config->createConnection());
if (_config->username != "") {
- string errmsg;
+ std::string errmsg;
// this can only fail if admin access was revoked since start of run
if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
uasserted(
diff --git a/src/mongo/util/net/miniwebserver.cpp b/src/mongo/util/net/miniwebserver.cpp
index 5f4165d42f4..7a7d0714934 100644
--- a/src/mongo/util/net/miniwebserver.cpp
+++ b/src/mongo/util/net/miniwebserver.cpp
@@ -47,6 +47,7 @@ namespace mongo {
using std::shared_ptr;
using std::stringstream;
using std::vector;
+using std::string;
MiniWebServer::MiniWebServer(const string& name, const string& ip, int port, ServiceContext* ctx)
: Listener(name, ip, port, ctx, false, false) {}

@ -1,11 +0,0 @@
--- SConstruct.orig 2017-06-27 19:02:43.000000000 +0000
+++ SConstruct 2017-07-07 11:33:13.252639289 +0000
@@ -2798,8 +2798,6 @@
if use_system_version_of_library("boost"):
if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ):
myenv.ConfError("can't find boost headers")
- if not conf.CheckBoostMinVersion():
- myenv.ConfError("system's version of boost is too old. version 1.49 or better required")
# Note that on Windows with using-system-boost builds, the following
# FindSysLibDep calls do nothing useful (but nothing problematic either)

@ -1,2 +1,3 @@
DIST mycli-1.10.0.tar.gz 272722 BLAKE2B f2a4d7b76684718167fb6bb4f90a96a31b669cf1f35c266ed544d00b4fe4f9b0cb2c6d81e161d41f1df785e2dcf79056a675857f8400d8cd7811199ea00064b7 SHA512 d66866fd23ee2be3f1bb47d1414b8151c2b50e8844a2553e139f753ae55dd010d1c23aae7c5863891ea4f347b124145405dc7894efc27fc8fcb74127c14261f8
DIST mycli-1.15.0.tar.gz 275065 BLAKE2B 47ae049a7a669d18fc2bb467dd4ee6d1bbe23a86115db6d1965c48c93a2a1be9bb8b4427b377f8ce935b957c854c1c4bf4a87fdea07f27329a13fd6a28b59559 SHA512 7a7d98220c4a679340dbf3c3c9fb3eaab7698f7abbe3e62835a03df10b59c79f0dfd916e9f7b39f12215063849ecadf9d08d086d14b00666b67bac1d092609f2
DIST mycli-1.7.1.tar.gz 266597 BLAKE2B 8fc6006dbb85a7053d67040d492ba12619507160efd240fdb89125794a01fbb439756bdeb420c306a883db925f6ec7ae0c36657c4c4b2197cfb702fc77babcb1 SHA512 5c61fe67f3205dd1123ed8d38441cda0574db04dd46b7e075d216f7aa8cd856a2f06a1b4bf7dbe9fd0b07f3e91c151fe3f885d10d3db488b6c306e0ce9ac9e7c

@ -0,0 +1,28 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
HOMEPAGE="http://mycli.net"
SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="
>=dev-python/click-4.1[${PYTHON_USEDEP}]
>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
>=dev-python/prompt_toolkit-1.0.10[${PYTHON_USEDEP}]
!>=dev-python/prompt_toolkit-1.1.0
>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
>=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
!>=dev-python/python-sqlparse-0.3.0
"

@ -17,12 +17,13 @@ KEYWORDS=""
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="
>=dev-python/cli_helpers-0.1.0[${PYTHON_USEDEP}]
>=dev-python/click-4.1[${PYTHON_USEDEP}]
>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
dev-python/cryptography[${PYTHON_USEDEP}]
>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
>=dev-python/prompt_toolkit-1.0.10[${PYTHON_USEDEP}]
!>=dev-python/prompt_toolkit-1.1.0
>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
>=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
!>=dev-python/python-sqlparse-0.3.0
"

@ -78,6 +78,8 @@ src_prepare() {
## remove hardcoded CXXFLAGS
sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
## And avoid -Werror
sed -i -e 's/-Werror//' CMakeLists.txt || die
## package is very fragile...
strip-flags

@ -0,0 +1,23 @@
diff -Naur postgis-2.4.2.old/liblwgeom/lwin_geojson.c postgis-2.4.2/liblwgeom/lwin_geojson.c
--- postgis-2.4.2.old/liblwgeom/lwin_geojson.c 2017-12-21 22:52:40.422802160 +0100
+++ postgis-2.4.2/liblwgeom/lwin_geojson.c 2017-12-21 22:55:36.605430945 +0100
@@ -31,13 +31,19 @@
#if defined(HAVE_LIBJSON) || defined(HAVE_LIBJSON_C) /* --{ */
+#define JSON_C_VERSION_013 (13 << 8)
+
#ifdef HAVE_LIBJSON_C
#include <json-c/json.h>
+#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013
#include <json-c/json_object_private.h>
+#endif
#else
#include <json/json.h>
+#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013
#include <json/json_object_private.h>
#endif
+#endif
#ifndef JSON_C_VERSION
/* Adds support for libjson < 0.10 */

@ -61,7 +61,8 @@ MAKEOPTS+=' -j1'
QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
src_prepare() {
eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch"
eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" \
"${FILESDIR}/postgis-2.4.2-jsonc_0.13.patch"
local AT_M4DIR="macros"
eautoreconf

@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+minimal odbcmanual static-libs unicode"
RDEPEND="

Binary file not shown.

@ -1,20 +1,3 @@
DIST avr-libc-1.6.2.tar.bz2 1044977 BLAKE2B c3a5ee0bd955502560617184415f32d475405cad2b494a326cfaaa4980f8154d6eee4f12b2cbca2577aaf0be3232d8e7e00915c1df8f83bc852813b8bfacb6f7 SHA512 9c79450c87b6a74b88dc9628984388c0d0e0a78639bdafae29fb84bf19daae250f8e21f65e269de25ed935bdfe0edf0671e025c81870909dfaff4ec6e68b370e
DIST avr-libc-1.6.4.tar.bz2 1137818 BLAKE2B 4bbabe97899041c5a73c9e496ba4c4fb567b4a4ec806679e1f6ae5ac5a65ec39bca1ffe80d101514ec0bc4ae51c34f133190ed53c66ddc39389dedf6d55effff SHA512 eef74396040990a930f504c05dfb9ab319ee5815411cdc48bdc389cf8e8bf33b8936cc52b1437f9a41fa965d9aa9503cf062bb9246b62af51d11abd84b2fbb53
DIST avr-libc-1.6.8.tar.bz2 1345899 BLAKE2B e3a6a94db83d62ce4cf5519dc3ea2bf2127397a4eec7f459ed799d454f7a02d263e099dc78350737f197723f122c511ff124d9a7be0ce46fea79119c72ed48ad SHA512 31ca1969bdbb0725aa19de8e84cfa5a2868403a454a828c915dd754d53965feed7a6441564a8b5c6e54e5879771d4e03dce086b2e699a088474c7e71968b9159
DIST avr-libc-1.7.0.tar.bz2 1409160 BLAKE2B 2c09fa8cea80887c93a99354c2bd68833c5897ad367113c29c7fd1c67eb35298a9491d124adf6ce568a0cc3ef81e9813a202f9d0572fb56a33f1426b1455a63b SHA512 7343c16aaf9760fdba10f5f3319e1b8698c7b87b0d6de03d6a34b7cc69741aa6a89ef84b6c952254541cf3ed90a26e22364254d06f170a8b67dce1e8e1cb3095
DIST avr-libc-1.7.1.tar.bz2 1417545 BLAKE2B 082deba6b9d20c5c95a487a37eccc8058552a445ca53fc7c4e2ca3ff8ad3df213651a2123f71e975db6dfe09752731c1c71a782c242cce03532d5c2a3880fb12 SHA512 814e41b84b62213782ef886140d6aae99a76495ad3c06796038e3c58a138a3ef55076b7809dab8f4ce856b2b49a29d23952230a7784a914e20507ce06a6f99ed
DIST avr-libc-1.8.0.tar.bz2 1428776 BLAKE2B c86dce55546e0837d608b48ad6242ac99059df0a4cd997d7e70cab083a9eb36cf36251cda92a772bbf94ac3d716cf02a8663c9cb93ccc44c55b28d1388a459e8 SHA512 932cd41be062c5930cf4d2c555b1748a6916cf8e901e2bdb6d79fec3193d8b142c32e26b9b48c680fd909cd4bafb5ed74c346846f0a4200386db6ddc2651567a
DIST avr-libc-1.8.1.tar.bz2 3230418 BLAKE2B a32e99127970b59f88955c2e90b36aceec7ac44c2de6338d7aa42ef9432ce68337c0119030c7c543867d3342b66f4adc64ec0a8c327b24caf5b1f4cc93c05d81 SHA512 9827028117d63bab9071bc0af68ef87038ed1e6e6c5cfd6db2c77a8387ce5b9eb2825c651405ad2842d81bc0abe173b76340b56671b930fc42d2f05bb7f261f7
DIST avr-libc-2.0.0.tar.bz2 3590893 BLAKE2B cc628f5f55d12c78ca9215e3e37b4a0061feae3c7c19653384b5d789fb6e1c70efe420631bf987379ae5524ec0f65c6df459eaad0fcfb80833cc4732ed5e796b SHA512 fc8d062043d633350dbe05978935dcb8028257a4f1013f246af9658aef0671def19ac11577d1ee9302df68df1b8cf030b22441d96852e185db212263aacabea6
DIST avr-libc-manpages-1.6.2.tar.bz2 133249 BLAKE2B 2aa23b9ec51cf4061418e9ec1859904a39bb18e5aac28dada874601ddb750601b085c294232080c9f558a014bb9433b9b0a02108eca8c34e34b69f7efe764a40 SHA512 8eb4aa0aedb20613253e4f17424251752fd61c5095690e69b2a4a0d6072460a0015379c04b9f01946d1063942ec876b6c6f2c0689878bfd8473a5e1cd31a534b
DIST avr-libc-manpages-1.7.0.tar.bz2 143540 BLAKE2B 234e72ffcd4063ea1274c325fd7a1cab5abaa6524140f9d9677740797bc3268f5be3a2367d452055665369afd3c2ede9f32e4caf9e6749fb72459bb3de982c5e SHA512 4422deb8778be3e617d6059ba9c40f7cd4069f3f3d8343944f8aa370fc88aa5934c6f5bb375c130ff59bb7450599bb13da4cf127a87f8057abb85eb68001d702
DIST avr-libc-manpages-1.7.1.tar.bz2 143831 BLAKE2B 3a727c168f0833906bd4056838b7983f50b1963167e6f1738862eae76eedd53d972aa2b7e3622da2df9049b5cfbafdfe9cb778fe92ff79844890bf5589d267a4 SHA512 c77f60be472a26ec7a158dcbfc38960dcde7bc192518bf5a35d339c628cf39030f44c56785770a3e0c01ced568e6ca7fff0f655e4a396348464c9d23cc1ccd3e
DIST avr-libc-manpages-1.8.0.tar.bz2 127217 BLAKE2B b48b97a7dd750be78ceb2259845037e180f386d7d539d0f1e11891affa9612eb70c3c6b684068d9cac9a436c6a804bc411e25ae9cf014a30d6556f60ffa7a37a SHA512 8b7d5734ded698f0f136b8a38785efc87d288ece7fbed943e7da0d1c6aa21ffd73707e63d54757df47da687d5e6d70d781bf9b4947624976921b5fb5c9cffc86
DIST avr-libc-manpages-1.8.1.tar.bz2 158580 BLAKE2B 218f3756ebcca0004d03b0a89fcd7f95987b5d3e7549b60853070fed1aca2caae8f9fa77485005f834b6203bcdb44402bb9f16bf5918f1b04dc5aa2b9ff9222b SHA512 84f12c4b56b0c5e21edb0ad27a68c8b1d665a60b19bd2aee10714840d4153cb5aff65f90b0e815ddce9037ad06a4a3b54856cf81b0aea85a1d97a0cf3c672a80
DIST avr-libc-manpages-2.0.0.tar.bz2 151137 BLAKE2B 7fbaa9c1014e8cf9b4caac723b57f9c24272da458b987ba302730116437bb3a5b49296c6804d857b421e6f71f2c4efda959d278ebcc14aba35fdd44a958dfca8 SHA512 8b4aaa6ae176076171e90e629e0e6142c4c56f9cc4f1640432384276df2f7b457f5137739535b07b9cede9b5b2e564db7fe200203faa4e2d0cd9874432507823
DIST avr-libc-user-manual-1.6.2.tar.bz2 511408 BLAKE2B 11dfe0eb953c83275ebd9c630ba67611713fe6fa71efc19fbe05e9a4b95ad1208e6e41946bfd3754186c352d67c5fb3cd4f9334e330000608d37810290de0409 SHA512 09d531d612b72fff9dc3f0bbdf34866ed9f2b979d7d00adfd9e6d52557bb1500f18936c3b859ce7a477df6cf63bfbfab53871b6c4565f3127faa67ad912704e1
DIST avr-libc-user-manual-1.7.0.tar.bz2 690477 BLAKE2B f7296ed96dfa618c7f6e78cdc44b1e848dc22c5136b017868bf832c07c56d14ccb247962ddcfc511fb56f100dfa8d0ebad45d25d4bdde587536b6d3b0294cd3c SHA512 d8fd5e9c35b840f094c06620836744982c2302a024499f4dcbfaa107a52dac3eaaaaa58ce49529d31a60cf6c1ecdfb9b2c9313febc7cb82c7577b7da22db65a4
DIST avr-libc-user-manual-1.7.1.tar.bz2 692262 BLAKE2B 786d441a44d3159ed0bd63a96a7a41729fce18d511bbaa22e4d3051c0f18028fe01e822c71da18fed50b9d557c2fbc5c68e7089bd618f31a57b07b8b7769f9d6 SHA512 9996ed97aac12a37c589beb32d761dc0740b321bb219d316091f9b3a763b8a96401c2de6cf99f89744d337a482e8be88104778deb6d8b9a76e96870526139d5e
DIST avr-libc-user-manual-1.8.0.tar.bz2 705087 BLAKE2B 637927cb5f486678d8172ad76f61e9b69ff9c6f55ea7f7c9f7aca6b7219218e806d1be3f551ceb919240162fa054c9b6bca10217eec633cddf9fb261491806f4 SHA512 731fbc45e9184b70f28001a9427d72ab5385017f1d8f197b2c942e458a6542632420f11e57a81949586d6fd8d4f4cd401b5fc76595ab7d95ccad7b158ceef59b
DIST avr-libc-user-manual-1.8.1.tar.bz2 864405 BLAKE2B aab98ce1c3d4e3aec1cdd760487692d03b7563abf3d5da4a078da8cff98ec73aa5f99594f63c109ffd83506d6ddb94b889cabde7871e34c53f7a2b2353a0168a SHA512 65da1b6f648bc8f2dc23dca15be45c960606c44703407fcdb60a924174cd9970d9d4f5a9c10eda827b91a5dbd0cd122daab92458626e67817c3ad8a864baedf4
DIST avr-libc-user-manual-2.0.0.tar.bz2 932920 BLAKE2B d3190af26dbe38719bc78e73de31af1ce69d885b928f48a4fb9ccd145a33f19f71c017253ad16eadc641fc88495c642dd5fd1668c6bebddf7d813f70db01a3f6 SHA512 246180be1f793b46335a49f33028ff59bd7cc06ca3d8627309521801e405e0e1305663a2c0760521467e75732ad513749bf707732b59fb17744e51acda9bb2c6

@ -1,76 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
CHOST="avr"
CTARGET="avr"
inherit flag-o-matic
DOCS_PV="1.6.2"
DESCRIPTION="C library for Atmel AVR microcontrollers"
HOMEPAGE="http://www.nongnu.org/avr-libc/"
SRC_URI="https://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${DOCS_PV}.tar.bz2
doc? ( https://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${DOCS_PV}.tar.bz2 )"
LICENSE="BSD"
SLOT="0"
# 'amd64' is a blessed placeholder for crossdev. It could
# be any other arch. See bug #620316#c5
# Don't add more arches to KEYWORDS.
KEYWORDS="amd64"
IUSE="doc nls crosscompile_opts_headers-only"
DEPEND=">=sys-devel/crossdev-0.9.1"
[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
&& RDEPEND="!dev-embedded/avr-libc" \
|| RDEPEND=""
pkg_setup() {
# check for avr-gcc, bug #134738
ebegin "Checking for avr-gcc"
if type -p avr-gcc > /dev/null ; then
eend 0
else
eend 1
eerror
eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
eerror " $ crossdev -t avr"
eerror
die "AVR toolchain not found"
fi
}
src_compile() {
strip-flags
strip-unsupported-flags
mkdir obj-avr
cd "${S}"/obj-avr
ECONF_SOURCE="${S}" \
econf \
$(use_enable nls) \
|| die "econf failed"
emake || die "emake failed"
}
src_install() {
cd "${S}"/obj-avr
make DESTDIR="${D}" install || die "make install failed"
cd "${S}"
dodoc AUTHORS ChangeLog* NEWS README
# man pages can not go into standard locations
# as they would then overwrite libc man pages
dosed "s:\$(VERSION):${PVR}:" /usr/bin/avr-man
insinto /usr/share/doc/${PF}/man/man3
doins "${WORKDIR}"/man/man3/*
prepman /usr/share/doc/${PF}
use doc && dohtml "${WORKDIR}"/${PN}-user-manual-${DOCS_PV}/*
}

@ -1,76 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
CHOST="avr"
CTARGET="avr"
inherit flag-o-matic
DOCS_PV="1.6.2"
DESCRIPTION="C library for Atmel AVR microcontrollers"
HOMEPAGE="http://www.nongnu.org/avr-libc/"
SRC_URI="https://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${DOCS_PV}.tar.bz2
doc? ( https://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${DOCS_PV}.tar.bz2 )"
LICENSE="BSD"
SLOT="0"
# 'amd64' is a blessed placeholder for crossdev. It could
# be any other arch. See bug #620316#c5
# Don't add more arches to KEYWORDS.
KEYWORDS="~amd64"
IUSE="doc nls crosscompile_opts_headers-only"
DEPEND=">=sys-devel/crossdev-0.9.1"
[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
&& RDEPEND="!dev-embedded/avr-libc" \
|| RDEPEND=""
pkg_setup() {
# check for avr-gcc, bug #134738
ebegin "Checking for avr-gcc"
if type -p avr-gcc > /dev/null ; then
eend 0
else
eend 1
eerror
eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
eerror " $ crossdev -t avr"
eerror
die "AVR toolchain not found"
fi
}
src_compile() {
strip-flags
strip-unsupported-flags
mkdir obj-avr
cd "${S}"/obj-avr
ECONF_SOURCE="${S}" \
econf \
$(use_enable nls) \
|| die "econf failed"
emake || die "emake failed"
}
src_install() {
cd "${S}"/obj-avr
emake DESTDIR="${D}" install || die "make install failed"
cd "${S}"
dodoc AUTHORS ChangeLog* NEWS README
# man pages can not go into standard locations
# as they would then overwrite libc man pages
dosed "s:\$(VERSION):${PVR}:" /usr/bin/avr-man
insinto /usr/share/doc/${PF}/man/man3
doins "${WORKDIR}"/man/man3/*
prepman /usr/share/doc/${PF}
use doc && dohtml "${WORKDIR}"/${PN}-user-manual-${DOCS_PV}/*
}

@ -1,75 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
CHOST="avr"
CTARGET="avr"
inherit flag-o-matic
DOCS_PV="1.6.2"
DESCRIPTION="C library for Atmel AVR microcontrollers"
HOMEPAGE="http://www.nongnu.org/avr-libc/"
SRC_URI="https://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${DOCS_PV}.tar.bz2
doc? ( https://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${DOCS_PV}.tar.bz2 )"
LICENSE="BSD"
SLOT="0"
# 'amd64' is a blessed placeholder for crossdev. It could
# be any other arch. See bug #620316#c5
# Don't add more arches to KEYWORDS.
KEYWORDS="~amd64"
IUSE="doc crosscompile_opts_headers-only"
DEPEND=">=sys-devel/crossdev-0.9.1"
[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
&& RDEPEND="!dev-embedded/avr-libc" \
|| RDEPEND=""
pkg_setup() {
# check for avr-gcc, bug #134738
ebegin "Checking for avr-gcc"
if type -p avr-gcc > /dev/null ; then
eend 0
else
eend 1
eerror
eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
eerror " $ crossdev -t avr"
eerror
die "AVR toolchain not found"
fi
}
src_compile() {
strip-flags
strip-unsupported-flags
mkdir obj-avr
cd "${S}"/obj-avr
ECONF_SOURCE="${S}" \
econf \
|| die "econf failed"
emake || die "emake failed"
}
src_install() {
cd "${S}"/obj-avr
emake DESTDIR="${D}" install || die "make install failed"
cd "${S}"
dodoc AUTHORS ChangeLog* NEWS README
# man pages can not go into standard locations
# as they would then overwrite libc man pages
dosed "s:\$(VERSION):${PVR}:" /usr/bin/avr-man
insinto /usr/share/doc/${PF}/man/man3
doins "${WORKDIR}"/man/man3/*
prepman /usr/share/doc/${PF}
use doc && dohtml "${WORKDIR}"/${PN}-user-manual-${DOCS_PV}/*
}

@ -1,71 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
CHOST="avr"
CTARGET="avr"
inherit flag-o-matic
DESCRIPTION="C library for Atmel AVR microcontrollers"
HOMEPAGE="http://www.nongnu.org/avr-libc/"
SRC_URI="https://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${PV}.tar.bz2
doc? ( https://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${PV}.tar.bz2 )"
LICENSE="BSD"
SLOT="0"
# 'amd64' is a blessed placeholder for crossdev. It could
# be any other arch. See bug #620316#c5
# Don't add more arches to KEYWORDS.
KEYWORDS="~amd64"
IUSE="doc crosscompile_opts_headers-only"
DEPEND=">=sys-devel/crossdev-0.9.1"
[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
&& RDEPEND="!dev-embedded/avr-libc" \
|| RDEPEND=""
pkg_setup() {
# check for avr-gcc, bug #134738
ebegin "Checking for avr-gcc"
if type -p avr-gcc > /dev/null ; then
eend 0
else
eend 1
eerror
eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
eerror " $ crossdev -t avr"
eerror
die "AVR toolchain not found"
fi
}
src_prepare() {
# work around broken gcc versions PR45261
local mcu
for mcu in $(sed -r -n '/CHECK_AVR_DEVICE/{s:.*[(](.*)[)]:\1:;p}' configure.ac) ; do
if avr-gcc -E - -mmcu=${mcu} <<<"" |& grep -q 'unknown MCU' ; then
sed -i "/HAS_${mcu}=yes/s:yes:no:" configure
fi
done
strip-flags
strip-unsupported-flags
}
src_install() {
emake DESTDIR="${D}" install || die
dodoc AUTHORS ChangeLog* NEWS README
# man pages can not go into standard locations
# as they would then overwrite libc man pages
dosed "s:\$(VERSION):${PVR}:" /usr/bin/avr-man
insinto /usr/share/doc/${PF}/man/man3
doins "${WORKDIR}"/man/man3/*
prepman /usr/share/doc/${PF}
use doc && dohtml "${WORKDIR}"/${PN}-user-manual-${PV}/*
}

@ -1,77 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
CHOST="avr"
CTARGET="avr"
inherit flag-o-matic eutils
DESCRIPTION="C library for Atmel AVR microcontrollers"
HOMEPAGE="http://www.nongnu.org/avr-libc/"
SRC_URI="https://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${PV}.tar.bz2
doc? ( https://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${PV}.tar.bz2 )"
LICENSE="BSD"
SLOT="0"
# 'amd64' is a blessed placeholder for crossdev. It could
# be any other arch. See bug #620316#c5
# Don't add more arches to KEYWORDS.
KEYWORDS="~amd64"
IUSE="doc crosscompile_opts_headers-only"
DEPEND=">=sys-devel/crossdev-0.9.1"
[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
&& RDEPEND="!dev-embedded/avr-libc" \
|| RDEPEND=""
DOCS="AUTHORS ChangeLog* NEWS README"
pkg_setup() {
# check for avr-gcc, bug #134738
ebegin "Checking for avr-gcc"
if type -p avr-gcc > /dev/null ; then
eend 0
else
eend 1
eerror
eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
eerror " $ crossdev -t avr"
eerror
die "AVR toolchain not found"
fi
}
src_prepare() {
# Fix avr-libc bug #32988 causing an ICE with gcc-4.6.0
epatch "${FILESDIR}/${P}-gcc46.patch"
# work around broken gcc versions PR45261
local mcu
for mcu in $(sed -r -n '/CHECK_AVR_DEVICE/{s:.*[(](.*)[)]:\1:;p}' configure.ac) ; do
if avr-gcc -E - -mmcu=${mcu} <<<"" |& grep -q 'unknown MCU' ; then
sed -i "/HAS_${mcu}=yes/s:yes:no:" configure
fi
done
# Install docs in correct directory
sed -i -e "/DOC_INST_DIR/s:\$(VERSION):${PVR}:" configure || die
strip-flags
strip-unsupported-flags
}
src_install() {
default
# man pages can not go into standard locations
# as they would then overwrite libc man pages
insinto /usr/share/doc/${PF}/man/man3
doins "${WORKDIR}"/man/man3/*
prepman /usr/share/doc/${PF}
use doc && dohtml "${WORKDIR}"/${PN}-user-manual-${PV}/*
}

@ -1,78 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
CHOST="avr"
CTARGET="avr"
inherit flag-o-matic eutils
DESCRIPTION="C library for Atmel AVR microcontrollers"
HOMEPAGE="http://www.nongnu.org/avr-libc/"
SRC_URI="https://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${PV}.tar.bz2
doc? ( https://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${PV}.tar.bz2 )"
LICENSE="BSD"
SLOT="0"
# 'amd64' is a blessed placeholder for crossdev. It could
# be any other arch. See bug #620316#c5
# Don't add more arches to KEYWORDS.
KEYWORDS="amd64"
IUSE="doc crosscompile_opts_headers-only"
DEPEND=">=sys-devel/crossdev-0.9.1"
[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
&& RDEPEND="!dev-embedded/avr-libc" \
|| RDEPEND=""
DOCS="AUTHORS ChangeLog* NEWS README"
pkg_setup() {
# check for avr-gcc, bug #134738
ebegin "Checking for avr-gcc"
if type -p avr-gcc > /dev/null ; then
eend 0
else
eend 1
eerror
eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
eerror " $ crossdev -t avr"
eerror
die "AVR toolchain not found"
fi
}
src_prepare() {
epatch_user #455828
# work around broken gcc versions PR45261
local mcu
for mcu in $(sed -r -n '/CHECK_AVR_DEVICE/{s:.*[(](.*)[)]:\1:;p}' configure.ac) ; do
if avr-gcc -E - -mmcu=${mcu} <<<"" |& grep -q 'unknown MCU' ; then
sed -i "/HAS_${mcu}=yes/s:yes:no:" configure
fi
done
# Install docs in correct directory
sed -i -e "/DOC_INST_DIR/s:\$(VERSION):${PVR}:" configure || die
strip-flags
strip-unsupported-flags
}
src_install() {
default
# man pages can not go into standard locations
# as they would then overwrite libc man pages
insinto /usr/share/doc/${PF}/man/man3
doins "${WORKDIR}"/man/man3/*
use doc && dohtml "${WORKDIR}"/${PN}-user-manual-${PV}/*
# Make sure diff cross-compilers don't collide #414075
mv "${ED}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
}

@ -1,78 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
CHOST="avr"
CTARGET="avr"
inherit flag-o-matic eutils
DESCRIPTION="C library for Atmel AVR microcontrollers"
HOMEPAGE="http://www.nongnu.org/avr-libc/"
SRC_URI="https://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${PV}.tar.bz2
doc? ( https://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${PV}.tar.bz2 )"
LICENSE="BSD"
SLOT="0"
# 'amd64' is a blessed placeholder for crossdev. It could
# be any other arch. See bug #620316#c5
# Don't add more arches to KEYWORDS.
KEYWORDS="~amd64"
IUSE="doc crosscompile_opts_headers-only"
DEPEND=">=sys-devel/crossdev-0.9.1"
[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
&& RDEPEND="!dev-embedded/avr-libc" \
|| RDEPEND=""
DOCS="AUTHORS ChangeLog* NEWS README"
pkg_setup() {
# check for avr-gcc, bug #134738
ebegin "Checking for avr-gcc"
if type -p avr-gcc > /dev/null ; then
eend 0
else
eend 1
eerror
eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
eerror " $ crossdev -t avr"
eerror
die "AVR toolchain not found"
fi
}
src_prepare() {
epatch_user #455828
# work around broken gcc versions PR45261
local mcu
for mcu in $(sed -r -n '/CHECK_AVR_DEVICE/{s:.*[(](.*)[)]:\1:;p}' configure.ac) ; do
if avr-gcc -E - -mmcu=${mcu} <<<"" |& grep -q 'unknown MCU' ; then
sed -i "/HAS_${mcu}=yes/s:yes:no:" configure
fi
done
# Install docs in correct directory
sed -i -e "/DOC_INST_DIR/s:\$(VERSION):${PVR}:" configure || die
strip-flags
strip-unsupported-flags
}
src_install() {
default
# man pages can not go into standard locations
# as they would then overwrite libc man pages
insinto /usr/share/doc/${PF}/man/man3
doins "${WORKDIR}"/man/man3/*
use doc && dohtml "${WORKDIR}"/${PN}-user-manual-${PV}/*
# Make sure diff cross-compilers don't collide #414075
mv "${ED}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
}

@ -1,25 +0,0 @@
--- avr-libc-1.7.1.orig/include/avr/pgmspace.h
+++ avr-libc-1.7.1/include/avr/pgmspace.h
@@ -252,7 +252,7 @@
# define PSTR(s) ((const PROGMEM char *)(s))
#else /* !DOXYGEN */
/* The real thing. */
-# define PSTR(s) (__extension__({static char __c[] PROGMEM = (s); &__c[0];}))
+# define PSTR(s) (__extension__({static const char __c[] PROGMEM = (s); &__c[0];}))
#endif /* DOXYGEN */
#define __LPM_classic__(addr) \
--- avr-libc-1.7.1.orig/libc/stdlib/dtostre.c
+++ avr-libc-1.7.1/libc/stdlib/dtostre.c
@@ -37,9 +37,9 @@
char *
dtostre (double val, char *sbeg, unsigned char prec, unsigned char flags)
{
- __attribute__((progmem)) static char str_nan[2][4] =
+ __attribute__((progmem)) static const char str_nan[2][4] =
{"nan", "NAN"};
- __attribute__((progmem)) static char str_inf[2][sizeof(str_nan[0])] =
+ __attribute__((progmem)) static const char str_inf[2][sizeof(str_nan[0])] =
{"inf", "INF"};
char *d; /* dst */
char *s; /* src */

@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm"
KEYWORDS="amd64 arm"
IUSE=""
RDEPEND="virtual/libusb:1

@ -1,43 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
inherit udev
DESCRIPTION="A Device Firmware Update based USB programmer for Atmel chips"
HOMEPAGE="http://dfu-programmer.sourceforge.net"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm"
IUSE=""
RDEPEND="virtual/libusb:1
virtual/udev"
DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
# Upstream has fixed this in their configure already.
tc-export CPP PKG_CONFIG
sed -i \
-e "/LIBUSB_1_0_CFLAGS=/s:=.*:='$(${PKG_CONFIG} --cflags libusb-1.0)':" \
-e "/LIBUSB_1_0_LIBS=/s:=.*:='$(${PKG_CONFIG} --libs libusb-1.0)':" \
configure || die
}
src_install() {
default
cat <<-EOF > 70-dfu-programmer.rules
#
# do not edit this file, it will be overwritten on update
#
EOF
printf 'SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="%s", MODE="660", GROUP="plugdev", SYMLINK+="dfu-%%n"\n' \
2ff{a,b,9,7,4,3} >> 70-dfu-programmer.rules
udev_dorules 70-dfu-programmer.rules
}

@ -1 +1,2 @@
DIST esptool-2.1.tar.gz 68974 BLAKE2B 4aaddc9bf22a624de18e7d58b35a42f6fa27cf8bdfff119a270b9531f1e19ecb3f4d7eebad319a799068a19941bf0c843fc464fd5ae891d8e03e1a2bad54dd68 SHA512 be657df04a345d2c91bbe3a9cbb93cd7bb0bc68e61388ff4d134c88d514c74fe3f2c5e7c64f4100264bc5973b1d3e66251cdb16a77894fb9e116d9c6a54a8dc3
DIST esptool-2.2.tar.gz 70585 BLAKE2B ea4553d7857987233d1488e6db1993ec687ce10c9c810c7a5327043283fab19b10863106ecf8bfac6d7585a8bbf2823b90d7e225dd4a27bfb784f183e86c796a SHA512 a84b61875a8f227b8103fcc546eb1323547159fbdc962d0577eb6498126589c9fa3b23ca840d33ab2636d7c05de3eb048bdfbdbd86d895c8e37f9bbc169a4caa

@ -0,0 +1,29 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
HOMEPAGE="https://github.com/espressif/esptool"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}
dev-python/ecdsa[${PYTHON_USEDEP}]
dev-python/pyaes[${PYTHON_USEDEP}]
>=dev-python/pyserial-2.5[${PYTHON_USEDEP}]"
RESTRICT="test" # Uses a device connected to the serial port
python_test() {
${EPYTHON} test/test_esptool.py || die
}

Binary file not shown.

@ -1,4 +1 @@
DIST ecjsrc-3.5.2.zip 1298691 BLAKE2B 12da418b8e92c8ab6e9d670d323ec561b01fb387ea5b4cbbd851332f4a1efafb8cd560f3b30afada90fa71d0b75b1939f69608bb05c7ee329cc1b66ae296f5cb SHA512 5fb3a38358511c92c12dfebbb4beb91581de25e2a3e3b4593d0388531dea5bae469f677e5154b69d634ede7395375992ae9f043be36f6b5a0fcfa873dbc98558
DIST ecjsrc-3.6.zip 1310484 BLAKE2B 6b2155abb2e71187138b831aabb3b6716eab3c97ac9f30bf66625cb222aee7257088b494a81e95979fbaf1c5fa67575e3cd0438750e060642aa4e46fba389472 SHA512 23f5be36de85f8a95bf029e42df632aa417ffa58a84b50ab5f6c78dd1fa1882316c61165b4d0d7be2c2568226f1e1c352ea45e391759ca6c5c1fef97e8c5fada
DIST ecjsrc-4.2.1.jar 1417043 BLAKE2B dc6915ec85d96a6ecdafb04485549feeb6ef8329811e294647e9e179ff3b1ec3cea55c29ad23b306ff3489dbfe6f574dc691ee31080a592d71607d3a996e9bb4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20

@ -1,109 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit java-pkg-2 prefix toolchain-funcs
MY_PN="ecj"
DMF="R-${PV}-201002111343"
DESCRIPTION="Subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
HOMEPAGE="http://www.eclipse.org/"
SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
LICENSE="EPL-1.0"
SLOT="3.5"
KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="+native"
RDEPEND="sys-devel/gcc:*[gcj]
app-eselect/eselect-java"
DEPEND="${RDEPEND}
app-arch/unzip
!dev-java/eclipse-ecj:3.5[gcj]"
S="${WORKDIR}"
# for compatibility with java eclass functions
JAVA_PKG_WANT_SOURCE=1.4
JAVA_PKG_WANT_TARGET=1.4
MY_PS="${MY_PN}-${SLOT}"
java_prepare() {
# We don't need the ant adapter here
rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
rm -fr org/eclipse/jdt/internal/antadapter || die
# upstream build.xml excludes this
rm -f META-INF/eclipse.inf || die
# these java6 specific classes cannot compile with ecj
rm -fr org/eclipse/jdt/internal/compiler/{apt,tool}/ || die
}
src_compile() {
local javac_opts javac java jar
local gccbin=$(gcc-config -B)
local gccver=$(gcc-fullversion)
local gcj="${gccbin}/gcj"
javac="${gcj} -C --encoding=ISO-8859-1"
jar="${gccbin}/gjar"
java="${gccbin}/gij"
mkdir -p bootstrap || die
cp -pPR org bootstrap || die
cd "${S}/bootstrap" || die
einfo "bootstrapping ${MY_PN} with ${javac} ..."
${javac} ${javac_opts} $(find org/ -name '*.java') || die
find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
-exec ${jar} cf ${MY_PN}.jar {} + || die
cd "${S}" || die
einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
${java} -classpath bootstrap/${MY_PN}.jar \
org.eclipse.jdt.internal.compiler.batch.Main \
${javac_opts} -nowarn org || die
find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
-exec ${jar} cf ${MY_PN}.jar {} + || die
if use native; then
einfo "Building native ${MY_PS} library, patience needed ..."
${gcj} ${CFLAGS} ${LDFLAGS} -findirect-dispatch -shared -fPIC -Wl,-Bsymbolic \
-o ${MY_PS}.so ${MY_PN}.jar || die
fi
}
src_install() {
java-pkg_dojar ${MY_PN}.jar
sed -e "s|@SLOT@|${SLOT}|" \
"${FILESDIR}/${PN}.in" \
> "${T}"/${PN}-${SLOT} || die
eprefixify "${T}/${PN}-${SLOT}"
dobin "${T}/${PN}-${SLOT}"
use native && dolib.so ${MY_PS}.so
}
pkg_postinst() {
if use native; then
$(gcc-config -B)/gcj-dbtool -a $(gcj-dbtool -p) \
"${EPREFIX}"/usr/share/${PN}-${SLOT}/lib/ecj.jar \
"${EPREFIX}"/usr/$(get_libdir)/${MY_PN}-${SLOT}.so
fi
einfo "To select between slots of ECJ..."
einfo " # eselect ecj"
eselect ecj update ${PN}-${SLOT}
}
pkg_postrm() {
eselect ecj update
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save