gentoo resync : 10.01.2018

14 files changed, 70 insertions, 449 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index f1ed58261255..b7f4e34943ec 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index c3b43a148bdf..289e68187c27 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -7,7 +7,9 @@ AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10
 DIST etcd-2.3.8.tar.gz 2206562 BLAKE2B 754930b4b5f0e90386b2b4765a9dbb6790ae509a81d3430c3f7c2c828d90318db3b01a2faea0c7075078096ce74302f2be7444245047534749f49d13a927851e SHA512 4268de32797cab23e9e47784d31d5abd6982068c53d3cc9735a06719740dba45b73f4e067cbc7aa8aef5ca7c56d8be067f1076685ac82f64012b760d8b7f2bfc
 DIST etcd-3.2.12.tar.gz 3046578 BLAKE2B 7b7a071c6856a7f1b5b7ceb68a4efbac74fde6ed1211dabda7d715ea79cd4dc9c10b0f1345d70b8a21e52cb3ac6adfc37c232ea28ff88e5f401212b5a8610d73 SHA512 b672a35ba62efccffa09be6b3d2a84b99e8abcae87093539c705d82e13c0f985a9f07a3d885af7386595f12d433756176db107739749c301e7e5d096e85d018b
 DIST etcd-3.2.13.tar.gz 3047049 BLAKE2B f0ac987aef60fcc28636cfb60d5f4e00daee29a3d5167900599760090c3fa3d7932abb6224df5fb66ea5bdbc29a9ce7f7263a0e81522853ab190be94a6551ebc SHA512 4f3c5856ecf9e8a725d0ef80bb584e7b2edaf7215635a5c74fe32b175ce9f8d07ba57685586dfd79b893d04641d4169382d22f2eea442efc1112fa91c8175d45
+DIST etcd-3.3.0_rc1.tar.gz 3357505 BLAKE2B e9008dfc5b88e7aafcb0db08e09ac40a25b3c877ec6865e6ae73162f65bc75af777ab5e3822130269b19acba1472f8c7cbde48b70d29c7a0936618c6ee13e753 SHA512 1a3fc95b1a4f5a85c956fb3a8558ae2deaa116ff2efe32ef9fdca0e503f356b1477e3f9c19be6d1a3b7b992d030abcf9b9eb251b5c37c64f78a4fbbcd406872f
 EBUILD etcd-2.3.8.ebuild 1379 BLAKE2B a6bff7dcfef244a2de25f4bf9168eb41552e394edf4a5e573a5b7dcea580debc3a87008b9d77d717b31b0fe27dcc08cdee76f855865455cde2fd26c16aee00e4 SHA512 ea3065641cac36b9011238603479967c1de5ab6f0ccb61dbc54b751879ff239b43065034b17045eb9467e1870878e4837af88c922f9034899da1359b69be98f3
 EBUILD etcd-3.2.12.ebuild 1475 BLAKE2B 362f159043caf3e4eeb86dc6f986d20944ee0f6dcb056348e3cfb2ea91d7ac2e3cf8b7cc9f9453046e17fd1613edc6e327c0b21c77d523664a79926058b46bc0 SHA512 b7b1a31797590cde253eb3df3d891620c812456159aeaf5fb0ea332b91517b898604d7c57c3c78c9515ee2e72750794450c40e54a1852ea0a5dfda9c0d346fad
 EBUILD etcd-3.2.13.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
+EBUILD etcd-3.3.0_rc1.ebuild 1501 BLAKE2B 6bcbc8b5feb259c84a1e46ef368e2a787fb7cf75638f157f91955f0a04aa68cf129a07d6ad3684024fd50ecedd78ab9d05f9dc44109e7c42e06b0bef4c4b5fbd SHA512 cfb2878fe80595c53de400d553eeadf2917fc8f9d4b1143de18d8d0ab0d71f602bebf74a38d81f7541911c5f1892ddbd46cf94db2f80a5371e83d76eb727d064
 MISC metadata.xml 614 BLAKE2B be58143e8f3c7adfefa4be2af02a57738eb30bad4ccc63bb7756585cc71b5d40a705d0f16d61fe263f3858e53b965e3611386dcea04bba985a0bb09eb95231f0 SHA512 92fbd483e5a757d09c07c392cc6d54a5448b6ca02177fbc48ff9f1b4f558af4755e4590e3d7192dbc3e5a32d5bf797289a7b1067e585dd295e3e890b88af9cb2
diff --git a/dev-db/etcd/etcd-3.3.0_rc1.ebuild b/dev-db/etcd/etcd-3.3.0_rc1.ebuild
new file mode 100644
index 000000000000..bb257b8fde56
--- /dev/null
+++ b/dev-db/etcd/etcd-3.3.0_rc1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 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"
+MY_PV="${PV/_rc/-rc.}"
+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${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.9:="
+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 0700 /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
+}
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index dea8a512394f..e98fbc5c3e34 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,18 +1,10 @@
-AUX firebird-2.5.1.26351.0-superclassic.patch 713 BLAKE2B 1b02ef542874e03a6f2e64b7fcd3ee8cf72facb889a09e704cca261138feeb02d34e746d45c1d39c3446a00ac393f836c0c6807a1141191780c8d82e20e5ef79 SHA512 b1c0e253f25616ae6522f693e4a1202bcf290eab3d3cfc06f29e6822f8e55d1d316f0e45b89ebca2b4cd5c97bba07997a7e3aa7e5870ffaca28295d1f3d449cb
-AUX firebird-2.5.3.26780.0-deps-flags.patch 3054 BLAKE2B 8df857b3a32d543bc6861fa16567965f4559afdbc324dc50d10a6043e98497e07bb79470b6b4cbfccc5c20e58fbe8a1a1af3cc402403de19fb55a038d52bc635 SHA512 c786daaec706223c67c74448a317b5dcebcabeba17c244ebbf474763fd3d61e9ee5613241b94194a14816c2bd90dfff8a649bee9ab59eb78e085cb9f812ec9e8
-AUX firebird-2.5.7.27050.0-gcc6.patch 998 BLAKE2B 52cc8f328ac41a0f347ff93f30be7a65114ee44bc7f7006b58cae81d0784b0077daa0f0aaa4ed8cb45bc84075f82d37c8b59e19272cbeda5539ecb8a82118a43 SHA512 d4be93d50e0ae3e6529d04c624ac926592d4b848133b08aaf6ccea578c91809e9200862fbf9bb2cc1d709e79b5b08545109232cc9f90cb817cb2ef873b1b5f74
 AUX firebird-3.0.2.32703.0-cloop-compiler.patch 349 BLAKE2B 6906993819f5aa68c39522d82bb7fb57b910f8f311d173a326147a98e983d8cd95ca90dbb538a5caa696ce4337305ece744306bf88f608cc8639bdda198e4576 SHA512 1d57f26ada2023d8bd04d73dd0f55951cef6b373710c8cf73b6bea0b4d54f879d689644d26541b2366bd1071b08eda2e1b531f3779a88b8fb52d3c9312f0c091
 AUX firebird-3.0.2.32703.0-gcc6.patch 806 BLAKE2B 85109e33f130582110e37188ef99cec5e5f0f3f95c481580df3a8c8a97215cd8e070e3febe47e46659e025b8a0c138fd0b271a5fd4b4aa67ca52419cef88db04 SHA512 184f754c4c23b7917acfabf1a5024069b8f35f58e667112a203a02e906560f2f5fea711b12975dafb3adcbe5159999e40fa459898a41d88e6de9b3499d8eaa67
 AUX firebird-3.0.2.32703.0-unbundle.patch 1786 BLAKE2B 660af04975ecfdac0ae12a1ee89e0a4d97d321ac7de7e17ba53484a909962584828c18d1f119ecc1af63c1cb2b93f451b847c9363a25831630a807b89ad13bc8 SHA512 bb0f8cb283ee230f9128a9da16da21933a1709615b34bbfac117a0563e2451a07381b52ffc1fed665e74688ff8e2c2548f86c1413427665914cb3df8500543c5
-AUX firebird.conf.d.2.5 270 BLAKE2B 99f3da2e84253db3125b15f3c94b5c7a2b1872992557afd1f0a0ea8ce9b4ce46b9e70382e2dea32d98b22f0eb44535cc8e75003dbf2c25786a1dde94e8c485bd SHA512 ac1410f45accae1beb845eb895592524be22fd0afb457aac4146dc6dc0a79c74c7e62eb814477797a10661a57bb731ade02a2a3b3fd8f5c5ef0c3b80e809bb64
-AUX firebird.init.d.2.5 517 BLAKE2B 3ad051358d55dd60dac5ec25d20b7b7c16ac2dd97e0102e2c7c1469f164fc8b032920dda40e1986942a7d96112514021f374871d2fa043497994c05b3f17201d SHA512 7bc825cf596bcb01520d8f72bd577ec2c02f25b2f3f7b261c5dd9ac9fd08dae62dff491dcc934162f06aa85fd822950555a2a2376529531cdc9c80fafb11fb5b
 AUX firebird.init.d.3.0 642 BLAKE2B 70f9b07a69c01e391ea8b1f1747a35eb303ff43a4923d65f76064257bfe5178601fa0b06dbf332b6a3529df30ddbe3e3c58e170ca33acfeb06a32474f1806938 SHA512 0805311d7e4ceb9cd5266be88fe61fb7d2d7cf5bf3c9482841c6431767cba9960d4f38418629519b23cdf64893173ebd01641056123ddc7f24c1f1bbf969812b
 AUX firebird.logrotate 169 BLAKE2B e73e2ff85882cda144f969a9a20426f2e5bfbaf2ce894e4e7adf67a33eb4cb5f1bc2039385437dcc60436145b0d29bd1b9311d8328f68ad7870aea50b8e5402d SHA512 f99edc010272af28f18e2b89e420aabc204feda918a1181e477edb56612b6af97ca6bab2e39989db401eb8296e3233a64853f824af437329e117f09aa9868823
-AUX firebird.xinetd 199 BLAKE2B 8fa4d650fc506650ac574901e1900fef87d0d11f21d50538d75253b55f72fa8eda14291b5476c62abdb9dfbfe32c49e76a807df148152cdbc40ceedea361262b SHA512 4fc963b213e3cb13f1314129a7f5e04c44e3abd3b9cd6b28ea70219e34ecceda24995dc2f1a0a8ea342b016a897726f655604aa2ae6e7035e387d706515d1bfb
 AUX firebird.xinetd.3.0 193 BLAKE2B 34017b978344bc2b05cfe7b92eafd56ba20dd78d1fa21dfb5455d7972325cedae9a6ac25b4fa491899b19cb3bbe2949b8ca78626467100661767f6c944b01c20 SHA512 e02c011b55c1d6823b051d14dbfabef6d034db32ee8046adc796fdf393c837b995c270e0efdcb97950f6fead82cd73773099a247dc29961b0e8f6c4f6c0723ae
-DIST Firebird-2.5.7.27050-0.tar.bz2 13402538 BLAKE2B fbe7af7b5cfa738459df7fd1dba0b897b04f2f6c8244d1f951e18c908c298e91e89b2300677c45834103e5215856341f673040b80b761921e68b1dc05381938b SHA512 793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327
 DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 BLAKE2B 58afbdb430adb5f9aafe33d5459fb4fe8607e9440b6b114291777e43d447a7a5b5696c9f5903a10b63217a15836ce6386569e636369e37bf83195ec0b96e4fc6 SHA512 5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
 DIST ib_b60_doc.zip 10530848 BLAKE2B b4008b3e8b0416014d024cbbc9ac2e648ad671c71b91b7aeb0eedf0f8479aef80e22aff7105c5e7417e88bcf57f2cdacbc2d5f51a2ef7fb870f9d361c5f0ed6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a
-EBUILD firebird-2.5.7.27050.0.ebuild 8144 BLAKE2B b7596149a4745fe32bf269ce15edf769c932de29d7abb51bff4614149b9904f08ac437c558495a1c87e58b80e60795e3103fb0b659706a789ed02da2b9dda417 SHA512 0347b1890b870e924c20d8e892a5265ea6e7cff432079aaea3b24e7a15deeba7e8afda2b9970542ed6a201e600a47a400fd3fe6ffece9fbc316175c6885e49dc
 EBUILD firebird-3.0.2.32703.0-r2.ebuild 6145 BLAKE2B b075b9a30669be1c9b6bfd1fe3bbf80ef935de98ca1b80adeb05704bf987808553127002e559c3c65f500c35f6db0c4f17c1e2cae18b673d21c5511d737d0477 SHA512 5cfec831ce2da2c3bbfc21b7911328c0ef79a43996c0b665d48dda213d9f85e9019ad0d9fc34495b33221f1008fe77b9861add6d22af07c447f3a0a481035739
-MISC metadata.xml 891 BLAKE2B 80d6dd7bc1ff34881f0f4afb087aa22f355967f7dcc6f09470990a4f3229c9db9bd518f2002405b5fcd76fdeaad6f857a4eef8a9df08ef747bf2958e694b5eab SHA512 57377261a4594289406adbe84618e011dcf338d25110501a8aa772d765cf4b0f0c892fbca0f032f49a13a869d5e9e9f99743e044ab4a6b687ca06033ed352ffa
+MISC metadata.xml 837 BLAKE2B 91e52f426cd9364da97ed6969369c3fa14a37e195f79192357d245e2e1ff90e20ada790e0a1904b05c4e9e0cdf25dec55aa4dbe14e2db32feb83bd5d465846a0 SHA512 98379c40f675f7b53e90e5327b76e554c17bda1ef7484165785b3d04884dd92fc3034c6b3f0f93667c456e7b23dc83f5143a8ec358759e2a0218c94e96127912
diff --git a/dev-db/firebird/files/firebird-2.5.1.26351.0-superclassic.patch b/dev-db/firebird/files/firebird-2.5.1.26351.0-superclassic.patch
deleted file mode 100644
index 3891cc776fae..000000000000
--- a/dev-db/firebird/files/firebird-2.5.1.26351.0-superclassic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur orig/builds/posix/Makefile.in.firebird builds/posix/Makefile.in.firebird
---- orig/builds/posix/Makefile.in.firebird	2010-11-09 12:42:45.000000000 -0500
-+++ builds/posix/Makefile.in.firebird	2011-03-07 20:26:56.612573632 -0500
-@@ -332,7 +332,7 @@
- .PHONY: libfbembed inet_server fb_smp_server embed_gfix embed_gbak embed_isql 
- .PHONY: embed_gpre embed_util
- 
--classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed inet_server fb_smp_server embed_gfix embed_gbak embed_isql \
-+classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed fbserver fb_smp_server embed_gfix embed_gbak embed_isql \
- 	embed_gpre libfbclient embed_util embed_gdef embed_qli embed_fbudf $(PLAT_CLASSIC_POST_TARGET)
- 
- libfbembed:
diff --git a/dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch b/dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch
deleted file mode 100644
index 506a6c07a79c..000000000000
--- a/dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird
---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird	2011-03-28 15:10:09.814370706 -0400
-@@ -158,7 +158,7 @@
- # some complications particularly for super in needing to start the server
- # that you are currently building. MOD 28-July-2002
- 
--firebird_basic: btyacc_binary external_libraries firebird_boot basic_targets
-+firebird_basic: firebird_boot basic_targets
- 
- firebird_boot: updateBuildNum boot_phase1 boot_phase2 
- 
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults
---- Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults	2011-03-28 15:21:26.904370708 -0400
-@@ -138,7 +138,7 @@
- AR=			ar @AR_OPTIONS@ crsu
- LN=			@LN_S@
- RANLIB=			@RANLIB@
--BTYACC=$(ROOT)/extern/btyacc/btyacc
-+BTYACC=/usr/bin/btyacc
- 
- CC =	@CC@
- CXX =	@CXX@
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux
---- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux	2011-03-25 21:38:29.031037374 -0400
-@@ -18,11 +18,10 @@
- #
- # 2 Oct 2002, Nickolay Samofatov - Major cleanup
- 
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
--OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
-+COMMON_FLAGS=-DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -MMD -fPIC -fmessage-length=0
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- 
--PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=$(COMMON_FLAGS)
- #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
- DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
- 
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64
---- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64	2011-03-25 21:39:15.134370707 -0400
-@@ -18,12 +18,11 @@
- #
- # 2 Oct 2002, Nickolay Samofatov - Major cleanup
- 
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
--OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer 
-+COMMON_FLAGS=-DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- CXXFLAGS:= $(CXXFLAGS) -fno-rtti
- 
--PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=$(COMMON_FLAGS)
- #DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS)
- DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
- 
diff --git a/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch b/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
deleted file mode 100644
index 312f3576bcc0..000000000000
--- a/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Bug: https://bugs.gentoo.org/608294
-PR: https://github.com/FirebirdSQL/firebird/pull/104
-
---- a/src/common/classes/alloc.h
-+++ b/src/common/classes/alloc.h
-@@ -498,10 +498,14 @@ using Firebird::MemoryPool;
-
- inline static MemoryPool* getDefaultMemoryPool() { return Firebird::MemoryPool::processMemoryPool; }
-
-+#if (( ! __GNUC__ ) || ( __GNUC__ < 6 ))
-+
- // Global versions of operators new and delete
- void* operator new(size_t s) THROW_BAD_ALLOC;
- void* operator new[](size_t s) THROW_BAD_ALLOC;
-
-+#endif
-+
- void operator delete(void* mem) throw();
- void operator delete[](void* mem) throw();
-
---- a/src/dudley/exe.epp
-+++ b/src/dudley/exe.epp
-@@ -2884,9 +2884,9 @@ static USHORT get_prot_mask( const TEXT * relation, TEXT * field)
- 		blr_parameter, 0, 0, 0,
- 		blr_parameter, 0, 1, 0,
- 		blr_parameter, 1, 0, 0,
--		blr_end,
--		blr_end,
--		blr_end,
-+		static_cast<SCHAR>(blr_end),
-+		static_cast<SCHAR>(blr_end),
-+		static_cast<SCHAR>(blr_end),
- 		blr_eoc
- 	};
- 	static FB_API_HANDLE req_handle;
diff --git a/dev-db/firebird/files/firebird.conf.d.2.5 b/dev-db/firebird/files/firebird.conf.d.2.5
deleted file mode 100644
index 625963d0c13b..000000000000
--- a/dev-db/firebird/files/firebird.conf.d.2.5
+++ /dev/null
@@ -1,7 +0,0 @@
-FBUSER=firebird
-FBGROUP=firebird
-FIREBIRD=/usr/lib/firebird
-FBGUARD=/usr/sbin/fbguard
-PIDFILE=/var/run/firebird/firebird.pid
-FB_OPTS="-forever -daemon -pidfile $PIDFILE"
-LD_LIBRARY_PATH=/usr/lib/:/usr/lib/firebird/intl/:/usr/lib/firebird/plugins/:/usr/lib/firebird/UDF/
diff --git a/dev-db/firebird/files/firebird.init.d.2.5 b/dev-db/firebird/files/firebird.init.d.2.5
deleted file mode 100644
index 9c9bfb92d601..000000000000
--- a/dev-db/firebird/files/firebird.init.d.2.5
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start_pre() {
-	checkpath -d -o $FBUSER "$(dirname $PIDFILE)"
-}
-
-start(){
-	ebegin "Starting Firebird server"
-	start-stop-daemon --start --pidfile $PIDFILE --user $FBUSER --group $FBGROUP --exec $FBGUARD -- $FB_OPTS
-	eend $?
-}
-
-stop(){
-	ebegin "Stopping Firebird server"
-	start-stop-daemon --stop --name fbguard
-	eend $?
-}
-
-restart(){
-	svc_stop
-	sleep 1
-	svc_start
-}
-
diff --git a/dev-db/firebird/files/firebird.xinetd b/dev-db/firebird/files/firebird.xinetd
deleted file mode 100644
index 01fc102ee3a8..000000000000
--- a/dev-db/firebird/files/firebird.xinetd
+++ /dev/null
@@ -1,11 +0,0 @@
-service gds_db
-{
-	flags			= REUSE
-	socket_type		= stream
-	wait			= no
-	user			= firebird
-	log_on_success		+= USERID
-	log_on_failure 		+= USERID
-	server			= /usr/bin/fb_inet_server
-	disable			= yes
-}
diff --git a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
deleted file mode 100644
index 68a0c71d850b..000000000000
--- a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic user versionator
-
-MY_P=${PN/f/F}-$(replace_version_separator 4 -)
-
-DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 features"
-HOMEPAGE="https://www.firebirdsql.org/"
-SRC_URI="
-	mirror://sourceforge/firebird/${MY_P}.tar.bz2
-	doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-LICENSE="IDPL Interbase-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug doc examples +superserver xinetd"
-REQUIRED_USE="?? ( superserver xinetd )"
-
-CDEPEND="
-	dev-libs/icu:=
-	dev-libs/libedit
-"
-DEPEND="${CDEPEND}
-	>=dev-util/btyacc-3.0-r2
-	doc? ( app-arch/unzip )
-"
-RDEPEND="${CDEPEND}
-	xinetd? ( virtual/inetd )
-	!sys-cluster/ganglia
-"
-
-RESTRICT="userpriv"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
-}
-
-check_sed() {
-	MSG="sed of $3, required $2 line(s) modified $1"
-	einfo "${MSG}"
-	[[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-src_unpack() {
-	unpack "${MY_P}.tar.bz2"
-	if use doc; then
-		# Unpack docs
-		mkdir "manuals" || die
-		cd "manuals" || die
-		unpack ib_b60_doc.zip
-	fi
-}
-
-src_prepare() {
-	use xinetd || eapply "${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
-
-	default
-
-	# Rename references to isql to fbsql
-	# sed vs patch for portability and addtional location changes
-	check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
-		src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
-	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
-		src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
-	check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
-		-e 's:isql :fbsql :w /dev/stdout' \
-		-e 's:ISQL :FBSQL :w /dev/stdout' \
-		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
-
-	find . -name \*.sh -exec chmod +x {} + || die
-	rm -r extern/{btyacc,editline,icu} || die
-
-	mv configure.in configure.ac || die "failed to mv configure.in configure.ac"
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -fprefetch-loop-arrays
-	filter-mfpmath sse
-	# bug 639614
-	append-cxxflags -flifetime-dse=1 -fno-sized-deallocation -fno-delete-null-pointer-checks
-
-	econf \
-		--prefix=/usr/$(get_libdir)/firebird \
-		$(use_enable superserver) \
-		$(use_enable debug) \
-		--with-editline \
-		--with-system-editline \
-		--with-system-icu \
-		--with-fbbin=/usr/bin \
-		--with-fbsbin=/usr/sbin \
-		--with-fbconf=/etc/${PN} \
-		--with-fblib=/usr/$(get_libdir) \
-		--with-fbinclude=/usr/include \
-		--with-fbdoc=/usr/share/doc/${P} \
-		--with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
-		--with-fbsample=/usr/share/doc/${P}/examples \
-		--with-fbsample-db=/usr/share/doc/${P}/examples/db \
-		--with-fbhelp=/usr/$(get_libdir)/${PN}/help \
-		--with-fbintl=/usr/$(get_libdir)/${PN}/intl \
-		--with-fbmisc=/usr/share/${PN} \
-		--with-fbsecure-db=/etc/${PN} \
-		--with-fbmsg=/usr/$(get_libdir)/${PN} \
-		--with-fblog=/var/log/${PN}/ \
-		--with-fbglock=/var/run/${PN} \
-		--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
-		--with-gnu-ld \
-		${myconf}
-}
-
-src_compile() {
-	MAKEOPTS="${MAKEOPTS/-j*/-j1} ${MAKEOPTS/-j/CPU=}"
-	emake
-}
-
-src_install() {
-	cd "gen/${PN}" || die
-
-	if use doc; then
-		dodoc "${S}"/doc/*.pdf
-		find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
-	fi
-
-	doheader include/*
-
-	rm lib/libfbstatic.a || die "failed to remove libfbstatic.a"
-
-	insinto /usr/$(get_libdir)
-	dolib.so lib/*.so*
-
-	# links for backwards compatibility
-	dosym libfbclient.so /usr/$(get_libdir)/libgds.so
-	dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
-	dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
-
-	insinto /usr/$(get_libdir)/${PN}
-	doins *.msg
-
-	einfo "Renaming isql -> fbsql"
-	mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
-
-	local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat nbackup qli"
-	for bin in ${bins}; do
-		dobin bin/${bin}
-	done
-
-	dosbin bin/fb_lock_print
-	# SuperServer
-	if use superserver ; then
-		dosbin bin/{fbguard,fbserver}
-	# ClassicServer
-	elif use xinetd ; then
-		dosbin bin/fb_inet_server
-	# SuperClassic
-	else
-		dosbin bin/{fbguard,fb_smp_server}
-
-		#Temp should not be necessary, need to patch/fix
-		dosym ../../libib_util.so /usr/$(get_libdir)/${PN}/lib/libib_util.so
-	fi
-
-	exeinto /usr/bin/${PN}
-	exeopts -m0755
-	doexe bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-
-	insinto /usr/$(get_libdir)/${PN}/help
-	doins help/help.fdb
-
-	exeinto /usr/$(get_libdir)/firebird/intl
-	dolib.so intl/libfbintl.so
-	dosym ../../libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
-	dosym libfbintl.so /usr/$(get_libdir)/libfbintl.so.1
-	dosym /etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
-
-	exeinto /usr/$(get_libdir)/${PN}/plugins
-	dolib.so plugins/libfbtrace.so
-	dosym ../../libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
-	dosym libfbtrace.so /usr/$(get_libdir)/libfbtrace.so.0
-
-	exeinto /usr/$(get_libdir)/${PN}/UDF
-	doexe UDF/*.so
-
-	insinto /usr/share/${PN}/upgrade
-	doins -r "${S}"/src/misc/upgrade/v2/*
-
-	insinto /etc/${PN}
-	insopts -m0644 -o firebird -g firebird
-	doins ../install/misc/*.conf
-	insopts -m0660 -o firebird -g firebird
-	doins security2.fdb
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/${PN}.xinetd" ${PN}
-	else
-		newinitd "${FILESDIR}/${PN}.init.d.2.5" ${PN}
-		newconfd "${FILESDIR}/${PN}.conf.d.2.5" ${PN}
-		fperms 640 /etc/conf.d/${PN}
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-	fperms 0644 /etc/logrotate.d/${PN}
-
-	diropts -m 755 -o firebird -g firebird
-	dodir /var/log/${PN}
-	keepdir /var/log/${PN}
-
-	use examples && docinto examples
-}
-
-pkg_postinst() {
-	# Hack to fix ownership/perms
-	chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}"
-	chmod 750 "${ROOT}/etc/${PN}"
-}
-
-pkg_config() {
-	# if found /etc/security.gdb from previous install, backup, and restore as
-	# /etc/security2.fdb
-	if [[ -f "${ROOT}/etc/firebird/security.gdb" ]] ; then
-		# if we have scurity2.fdb already, back it 1st
-		if [[ -f "${ROOT}/etc/firebird/security2.fdb" ]] ; then
-			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old" || die
-		fi
-		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk" || die
-		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb" || die
-		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old" || die
-		rm "${ROOT}/etc/firebird/security.gbk" || die
-
-		# make sure they are readable only to firebird
-		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}" || die
-		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}" || die
-
-		echo
-		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
-		einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
-		einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
-		echo
-	fi
-
-	# we need to enable local access to the server
-	if [[ ! -f "${ROOT}/etc/hosts.equiv" ]] ; then
-		touch "${ROOT}/etc/hosts.equiv" || die
-		chown root:0 "${ROOT}/etc/hosts.equiv" || die
-		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv" || die
-	fi
-
-	# add 'localhost.localdomain' to the hosts.equiv file...
-	if grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" ; then
-		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv" || die
-		einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost' to the hosts.equiv file...
-	if grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" ; then
-		echo "localhost" >> "${ROOT}/etc/hosts.equiv" || die
-		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	HS_NAME=`hostname`
-	if grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" ; then
-		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv" || die
-		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	einfo "If you're using UDFs, please remember to move them"
-	einfo "to /usr/$(get_libdir)/firebird/UDF"
-}
diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index a6eba6edad06..dfb6ac14ceca 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -9,7 +9,6 @@
 	in production systems, under a variety of names, since 1981.
 	</longdescription>
 	<use>
-		<flag name="superserver">Install SuperServer</flag>
 		<flag name="server">Install the server components of Firebird, not just the client</flag>
 		<flag name="xinetd">Install ClassicServer</flag>
 	</use>
diff --git a/dev-db/pgagent/Manifest b/dev-db/pgagent/Manifest
index fc86486ec85a..64bf9f42ac3f 100644
--- a/dev-db/pgagent/Manifest
+++ b/dev-db/pgagent/Manifest
@@ -8,5 +8,5 @@ AUX postgres-10-build-fix.patch 2421 BLAKE2B 3b6865e7843edf420b59b1f2ededbca9707
 AUX save-stderr-jobstep-output.patch 2626 BLAKE2B 8a0eb06fecb9450e027219f2ede7b9dc3fbeb6ad1d70e15f5294c954a924c9eb82b10569a6b045e6acd79430b1f5d7116ba4f19316599a2354dc9795ae274458 SHA512 b84b52e5a96d98067eab5e4877c54e02e3c912215067f4e1a1c9d3983a29acfd3e63fe666c6e62cf46391fb72cb02b4197d23e305cadf88da096f80d8e0c8167
 DIST pgAgent-3.4.0-Source.tar.gz 45081 BLAKE2B 81f074213285253743127188d9e203cb01d8492ce502dc5215279c7c557fdd7f532fa383a4578a8d9cc8ea46668ea971015e4cc5989d1b8022ed8924a92b988b SHA512 3b068fc6f5e51ff20604f8cec3e067d04b5b1537229da15ee442000f5fe834697a4eae86be0e9a58b8ee5da24cc985c8c9804d71cb2a50e93ec4cf9a424a4ff0
 EBUILD pgagent-3.4.0-r1.ebuild 1256 BLAKE2B 0fed29f4178ccb1356d9171d686466fd7289026abbaeda65aa5d4d186326d08ab1104ce590567e6eb701fd8ade20885183877afdc683fa66e01486de9ca1c18a SHA512 eb5144d64577348695c212947bf6741069e51102d390508d17eeb9104b0300529bd32dcc520adb791474bf8b728fc81d5c36142acbe153ec00c4669dc05c4d9a
-EBUILD pgagent-3.4.0-r3.ebuild 2050 BLAKE2B e9be4d2719c4ac59afe3ecedad86c8c04a0a8c67e7e18b5bcec881b3a0c165a148ee4fe233fc6e425a90c8c74221bab79d2181fd0551e6483bc38289ed5f135a SHA512 734a3c8d2171ed41b090d58832af5b9d99ffc08c132fc3dd25637e44f2a051a316e632e2a7f532ca8b809c54ecf5b346a99b92d793974be24b80f00153141e19
+EBUILD pgagent-3.4.0-r3.ebuild 2049 BLAKE2B 4ae98efd2272811968ca01d1ee6b67bcf754fd282d40468005f70adb12e16275057adfa9a278c6d20cea421ef72b14328234ded934fcd06dd22b6e0aa0881158 SHA512 bf02002878e50f7d31d00fab6f570cfd040656235638187c9a9d52a3ae9c6524bd9bf9045e9ac7d48c756e01bf83900acc7557714b42158230f8e3057c5f538a
 MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pgagent/pgagent-3.4.0-r3.ebuild b/dev-db/pgagent/pgagent-3.4.0-r3.ebuild
index e80fd88d3ce0..7895a7b7da99 100644
--- a/dev-db/pgagent/pgagent-3.4.0-r3.ebuild
+++ b/dev-db/pgagent/pgagent-3.4.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit cmake-utils user wxwidgets
 
 MY_PN=${PN/a/A}
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DESCRIPTION="${MY_PN} is a job scheduler for PostgreSQL"
 HOMEPAGE="http://www.pgadmin.org/download/pgagent.php"