gentoo resync : 21.07.2018

3 files changed, 2 insertions, 65 deletions

diff --git a/dev-ruby/ruby-odbc/Manifest b/dev-ruby/ruby-odbc/Manifest
index 21db33c412e6..14f247026664 100644
--- a/dev-ruby/ruby-odbc/Manifest
+++ b/dev-ruby/ruby-odbc/Manifest
@@ -1,5 +1,3 @@
-DIST ruby-odbc-0.99997.tar.gz 76708 BLAKE2B d122e7f2cccd305731ba598ca684761daab288903e0f3866735b2672f20a9c6b55ed74d768bd4f79a03e0d743b4dff4704f465e58ed331ce37762ba9f7c1e871 SHA512 15ea850efa9f65467ea829c93f7dc9ecbef9409876b19d0a309d085b20e711da2888b918f77fcd26e6a40096358eab836d6bc3000c534da88f4f3c2b60a8662a
 DIST ruby-odbc-0.99999.tar.gz 76934 BLAKE2B 59de5a544b7eefe8e181f2c6a9a61915361743ef5f7554f778667b50ca0dc57fd0c4f71e406ad6f1d00fb2c6a6509030e61ad34dddecff61896f7bfe383d0a9b SHA512 05e3e67a895406e1a57fbea6f8ecd1c087d836794ea3245bd9eec888eb3c46fa2bf2607cc1b8fdc416d7bc531d783d621c03c9fde004db8c2e431fe838c531af
-EBUILD ruby-odbc-0.99997-r1.ebuild 1484 BLAKE2B 18d2e05bd4cc0eb7ad034edcf24439d35d08963e43f1c77869ae80adfa27485859dd48184e7d69fb58280263b101f133eaaee19d7f362f335da4931b9c8d2771 SHA512 7a36ff449684777faa4bd5ae3aee430f49c7c24619e494220a3c8c456bf01f9be3a35b9e74cb123acb1c5c615078aacd3bb1632e48870026f743d53229e9d568
-EBUILD ruby-odbc-0.99999.ebuild 1485 BLAKE2B 2205e62132c5e233b3ec4e1636ee0c90bba455dfeb1812925176eaf735f9e9445d6262de039692d5e33478b3886d1ed4aa8df878c8042261b326a4c2ba911b5e SHA512 36c7dd561f07194a07b4c79af43c49c7cf9c34436fd2e13d65d6e400acade4050a7e5207dd4371ffbb0cfc9521a6d401bcb77aa1a5a9dbf506cc63314ee50605
+EBUILD ruby-odbc-0.99999.ebuild 1484 BLAKE2B 7323e78323916d173497778bac0211089bf721cdabc3df522c5e1e02b12aa846a85bb03f29b1278281c88b80b57b322ff8d716a022111ad6b5c5dffbe530e4f9 SHA512 0fba32f7c5af1c98ea6824faefc6009c666ce202c4f4a74f6acffe6a7c5dde53f3a03bac101902c80c6186b249439a6523b4287455bf98fa08610702df2588fc
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ruby-odbc/ruby-odbc-0.99997-r1.ebuild b/dev-ruby/ruby-odbc/ruby-odbc-0.99997-r1.ebuild
deleted file mode 100644
index c8b261c8b74c..000000000000
--- a/dev-ruby/ruby-odbc/ruby-odbc-0.99997-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RubyODBC - For accessing ODBC data sources from the Ruby language"
-HOMEPAGE="http://www.ch-werner.de/rubyodbc/"
-SRC_URI="http://www.ch-werner.de/rubyodbc/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="${DEPEND} >=dev-db/unixODBC-2.0.6"
-RDEPEND="${RDEPEND} >=dev-db/unixODBC-2.0.6"
-
-# tests require to have an ODBC service enabled, so we can't run them
-# for now :(
-RESTRICT=test
-
-all_ruby_prepare() {
-	# Make sure that it doesn't try to use the absolute-local path for
-	# the extension as we'd be unable to run it properly otherwise.
-	sed -i -e 's:\./odbc:odbc:' test/{,utf8/}test.rb || die
-
-	# Since lib should not get installed avoid it entirely…
-	mv lib contrib || die
-}
-
-each_ruby_configure() {
-	for dir in ext ext/utf8; do
-		${RUBY} -C${dir} extconf.rb --disable-dlopen || die "extconf (${dir}) failed"
-	done
-}
-
-each_ruby_compile() {
-	for dir in ext ext/utf8; do
-		emake V=1 -C${dir} || die "emake (${dir}) failed"
-	done
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	ruby_fakegem_newins ext/odbc.so lib/odbc.so
-	ruby_fakegem_newins ext/utf8/odbc_utf8.so lib/odbc_utf8.so
-}
-
-all_ruby_install() {
-	all_fakegem_install
-	dohtml doc/*.html || die
-}
diff --git a/dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild b/dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild
index 17a995e7b856..0ac09ca47400 100644
--- a/dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild
+++ b/dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.ch-werner.de/rubyodbc/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="${DEPEND} >=dev-db/unixODBC-2.0.6"