* [gentoo-commits] dev/dev-zero:master commit in: dev-ruby/charlock_holmes/files/, dev-ruby/charlock_holmes/
@ 2013-07-02 12:54 Tiziano Müller
0 siblings, 0 replies; 2+ messages in thread
From: Tiziano Müller @ 2013-07-02 12:54 UTC (permalink / raw
To: gentoo-commits
commit: 8fb451db4efad0f176d2af94567de0c1357f7bc8
Author: Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Tue Jul 2 12:53:57 2013 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 12:53:57 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=8fb451db
Importing ebuild from a3li's overlay (required for github-linguist).
---
dev-ruby/charlock_holmes/Manifest | 3 ++
.../charlock_holmes/charlock_holmes-0.6.8.ebuild | 50 ++++++++++++++++++++++
dev-ruby/charlock_holmes/files/extconf.patch | 43 +++++++++++++++++++
3 files changed, 96 insertions(+)
diff --git a/dev-ruby/charlock_holmes/Manifest b/dev-ruby/charlock_holmes/Manifest
new file mode 100644
index 0000000..0d3f8d6
--- /dev/null
+++ b/dev-ruby/charlock_holmes/Manifest
@@ -0,0 +1,3 @@
+AUX extconf.patch 1340 SHA256 138eff2646dd79464fa91d2f2654af16d771bc79b9e078c241911c25c41a8f08 SHA512 507e56ae60c493dca44cf7abee1477b1df025d2ef3983a8c0a404a5606db97c1a808cc09c6946e0634377c167c24f96e76343a8a028c5eba9a08d09db81bb800 WHIRLPOOL 0fb6d1eabfa278041659fdd7d1e62499eda95971cdfe4a690dba715e2bb19015a8751f96230da81b937cf5d66bd9751b9340ada5ad5d090dfbba0d27200f2846
+DIST charlock_holmes-0.6.8.gem 648192 SHA256 1f3af070aa98fe464413cbc29741b6e4cd986f50e3e4e895771ca91e74428361 SHA512 d7eea160fae7167ac95900380c73c5292f2e455950543d9af394b3a3fdd73244b320e29f0cebcb9472ca78219b899edbd22c02f9857839cc1a375ff2b4795d88 WHIRLPOOL a2b0a04aa2aa993c80971e82ff7d278273109e934432e5d35226093f21dcea2cb84ed9ad8f1f673d432788aac29966aa4dcfae9c7892df23b540000e40a8d22d
+EBUILD charlock_holmes-0.6.8.ebuild 1140 SHA256 2c1f570fb1cddea5df800ed217a6c637d74cd81df54b5509bad5d23c6525b1c3 SHA512 11338b2b859abaafddd9334085ab1193e4f66b2d1a23bc9af9a18bbc3b47ce5869086a1de6f0dfde53279c62ea1d85bf3eafe8b00acea44648c65ce761d56070 WHIRLPOOL 115bb8e2987d3858a187a30dd2669fc99faedafbe0cfa3fa528a38e43234769ed3971d65b4133242a5652c7d14ac3e67f0a35326e4c48ea436bef2433c4fff8a
diff --git a/dev-ruby/charlock_holmes/charlock_holmes-0.6.8.ebuild b/dev-ruby/charlock_holmes/charlock_holmes-0.6.8.ebuild
new file mode 100644
index 0000000..9ca6545
--- /dev/null
+++ b/dev-ruby/charlock_holmes/charlock_holmes-0.6.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.0.22.ebuild,v 1.3 2012/05/01 18:24:03 armin76 Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+# No documentation task
+#RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Character encoding detection, brought to you by ICU"
+HOMEPAGE="https://github.com/brianmario/charlock_holmes"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Tests fail with obscure file not founds
+RESTRICT="test"
+
+ruby_add_rdepend "dev-ruby/rake-compiler"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
+
+RDEPEND="${RDEPEND}
+ dev-vcs/git
+ sys-apps/file"
+DEPEND="${DEPEND}
+ test? ( dev-vcs/git )"
+
+each_ruby_prepare() {
+ cd ext/charlock_holmes || die
+ epatch "${FILESDIR}/extconf.patch" || die
+}
+
+each_ruby_configure() {
+ ${RUBY} -Cext/charlock_holmes extconf.rb || die
+}
+
+each_ruby_compile() {
+ emake -Cext/charlock_holmes || die
+ mv ext/charlock_holmes/charlock_holmes$(get_modname) lib/charlock_holmes/ || die
+}
diff --git a/dev-ruby/charlock_holmes/files/extconf.patch b/dev-ruby/charlock_holmes/files/extconf.patch
new file mode 100644
index 0000000..335d193
--- /dev/null
+++ b/dev-ruby/charlock_holmes/files/extconf.patch
@@ -0,0 +1,43 @@
+Fixes two issues:
+ - Don't bundle file/libmagic
+ - Avoid underlinking by linking against libz, libicuuc, and libicudata
+
+--- extconf.rb.old 2012-05-27 11:17:30.798768657 +0200
++++ extconf.rb 2012-05-27 11:38:49.561899729 +0200
+@@ -45,31 +45,12 @@
+ exit(1)
+ end
+
+-##
+-# libmagic dependency
+-#
++# Fix underlinking
++have_library 'z' or abort 'libz missing'
++have_library 'icuuc' or abort 'libicuuc missing'
++have_library 'icudata' or abort 'libicudata missing'
+
+-src = File.basename('file-5.08.tar.gz')
+-dir = File.basename(src, '.tar.gz')
+-
+-Dir.chdir("#{CWD}/src") do
+- FileUtils.rm_rf(dir) if File.exists?(dir)
+-
+- sys("tar zxvf #{src}")
+- Dir.chdir(dir) do
+- sys("./configure --prefix=#{CWD}/dst/ --disable-shared --enable-static --with-pic")
+- sys("make -C src install")
+- sys("make -C magic install")
+- end
+-end
+-
+-FileUtils.cp "#{CWD}/dst/lib/libmagic.a", "#{CWD}/libmagic_ext.a"
+-
+-$INCFLAGS[0,0] = " -I#{CWD}/dst/include "
+-$LDFLAGS << " -L#{CWD} "
+-
+-dir_config 'magic'
+-unless have_library 'magic_ext' and have_header 'magic.h'
++unless have_library 'magic' and have_header 'magic.h'
+ STDERR.puts "\n\n"
+ STDERR.puts "***************************************************************************************"
+ STDERR.puts "********* error compiling and linking libmagic. please report issue on github *********"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/dev-zero:master commit in: dev-ruby/charlock_holmes/files/, dev-ruby/charlock_holmes/
@ 2013-07-02 17:25 Tiziano Müller
0 siblings, 0 replies; 2+ messages in thread
From: Tiziano Müller @ 2013-07-02 17:25 UTC (permalink / raw
To: gentoo-commits
commit: 55236858c9c91fa9a0817524cdae6c6a0091edb9
Author: Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Tue Jul 2 17:25:32 2013 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 17:25:32 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=55236858
Version bump, required for gitlab-grit.
---
dev-ruby/charlock_holmes/Manifest | 3 ++
.../charlock_holmes/charlock_holmes-0.6.9.4.ebuild | 41 ++++++++++++++++++++++
.../charlock_holmes/files/0.6.9.4-extconf.patch | 15 ++++++++
3 files changed, 59 insertions(+)
diff --git a/dev-ruby/charlock_holmes/Manifest b/dev-ruby/charlock_holmes/Manifest
index 0d3f8d6..40da336 100644
--- a/dev-ruby/charlock_holmes/Manifest
+++ b/dev-ruby/charlock_holmes/Manifest
@@ -1,3 +1,6 @@
+AUX 0.6.9.4-extconf.patch 586 SHA256 82b2b31681a7dfc009681ea0c055f12a1c2434e5373b9b2afac5d54c7a7485c2 SHA512 52e79d7eef80abb69ec99aefcb8f978e83845600185f09b28e164b357560f75a3bfebe0760d750e1e5634eaeb6280223377589abcb87da1dcb24e74305906fe4 WHIRLPOOL 3cb21bb0110d12eb4273bab97622d9a44c41a4dce09714d69d285f07d7f9b613be6f0c15cf6e4f972ce2370d66c011b97d964dc17cb28e69dfe875f09b9c211a
AUX extconf.patch 1340 SHA256 138eff2646dd79464fa91d2f2654af16d771bc79b9e078c241911c25c41a8f08 SHA512 507e56ae60c493dca44cf7abee1477b1df025d2ef3983a8c0a404a5606db97c1a808cc09c6946e0634377c167c24f96e76343a8a028c5eba9a08d09db81bb800 WHIRLPOOL 0fb6d1eabfa278041659fdd7d1e62499eda95971cdfe4a690dba715e2bb19015a8751f96230da81b937cf5d66bd9751b9340ada5ad5d090dfbba0d27200f2846
DIST charlock_holmes-0.6.8.gem 648192 SHA256 1f3af070aa98fe464413cbc29741b6e4cd986f50e3e4e895771ca91e74428361 SHA512 d7eea160fae7167ac95900380c73c5292f2e455950543d9af394b3a3fdd73244b320e29f0cebcb9472ca78219b899edbd22c02f9857839cc1a375ff2b4795d88 WHIRLPOOL a2b0a04aa2aa993c80971e82ff7d278273109e934432e5d35226093f21dcea2cb84ed9ad8f1f673d432788aac29966aa4dcfae9c7892df23b540000e40a8d22d
+DIST charlock_holmes-0.6.9.4.gem 651776 SHA256 e52db7af0f7a652f55244455f84b4f1c09144f0d5e416f677a912f9147d6dfef SHA512 00a1d920418a1ebaf43245f8f94de831de15f29d972eac9e69ae9bcccc88140282c3a57f4f1a35ad49cb336df82589c19f7852bc60f9debfb1253b7111c36d32 WHIRLPOOL 1e743109f32ed81890f6e6f4ef771afc32299836e6e0eefe9ac6546b63cafcc61713601a774c11bd253489f6f51399f9decd157e53953d80d7f7f729ba0cb9a7
EBUILD charlock_holmes-0.6.8.ebuild 1140 SHA256 2c1f570fb1cddea5df800ed217a6c637d74cd81df54b5509bad5d23c6525b1c3 SHA512 11338b2b859abaafddd9334085ab1193e4f66b2d1a23bc9af9a18bbc3b47ce5869086a1de6f0dfde53279c62ea1d85bf3eafe8b00acea44648c65ce761d56070 WHIRLPOOL 115bb8e2987d3858a187a30dd2669fc99faedafbe0cfa3fa528a38e43234769ed3971d65b4133242a5652c7d14ac3e67f0a35326e4c48ea436bef2433c4fff8a
+EBUILD charlock_holmes-0.6.9.4.ebuild 824 SHA256 77f35cfc1ac787e8801dde090f8a2900f538e4bd67bc780da60fc185289faf96 SHA512 5325fd2ff3d00aaea951a500c6d18a867a0574d0bd643882b03bcb0837570cb6ddfe3e76a2b042f4e7b2947ebc8243ebbd537ddd74ecb36c3d77e0801ebcb3b0 WHIRLPOOL 3ae9908cc5417925d9db25d6e217d025fdccf90e3995868148eb42bc518c83325523c8fd9b7584a4de4d329e8ee1e15243d59e04856dd2c7dd25832b78f56e60
diff --git a/dev-ruby/charlock_holmes/charlock_holmes-0.6.9.4.ebuild b/dev-ruby/charlock_holmes/charlock_holmes-0.6.9.4.ebuild
new file mode 100644
index 0000000..0bb1223
--- /dev/null
+++ b/dev-ruby/charlock_holmes/charlock_holmes-0.6.9.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Character encoding detection, brought to you by ICU"
+HOMEPAGE="https://github.com/brianmario/charlock_holmes"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+# TODO: bundles 'libmagic' (file), but it is patched
+# and tests fail with vanilla 'libmagic'
+
+ruby_add_bdepend "dev-ruby/rake-compiler
+ test? ( dev-ruby/rspec:2 )"
+
+# fix underlinking
+RUBY_PATCHES=( ${PV}-extconf.patch )
+
+all_ruby_prepare() {
+ sed -i -e '/[Bb]undler/d' test/helper.rb || die
+}
+
+each_ruby_compile() {
+ ${RUBY} -S rake compile || die
+}
diff --git a/dev-ruby/charlock_holmes/files/0.6.9.4-extconf.patch b/dev-ruby/charlock_holmes/files/0.6.9.4-extconf.patch
new file mode 100644
index 0000000..0711d80
--- /dev/null
+++ b/dev-ruby/charlock_holmes/files/0.6.9.4-extconf.patch
@@ -0,0 +1,15 @@
+diff --git a/ext/charlock_holmes/extconf.rb b/ext/charlock_holmes/extconf.rb
+index 929b87d..509c115 100644
+--- a/ext/charlock_holmes/extconf.rb
++++ b/ext/charlock_holmes/extconf.rb
+@@ -69,6 +69,10 @@ FileUtils.cp "#{CWD}/dst/lib/libmagic.a", "#{CWD}/libmagic_ext.a"
+ $INCFLAGS[0,0] = " -I#{CWD}/dst/include "
+ $LDFLAGS << " -L#{CWD} "
+
++have_library 'z' or abort 'libz missing'
++have_library 'icuuc' or abort 'libicuuc missing'
++have_library 'icudata' or abort 'libicudata missing'
++
+ dir_config 'magic'
+ unless have_library 'magic_ext' and have_header 'magic.h'
+ STDERR.puts "\n\n"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-07-02 17:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-02 12:54 [gentoo-commits] dev/dev-zero:master commit in: dev-ruby/charlock_holmes/files/, dev-ruby/charlock_holmes/ Tiziano Müller
-- strict thread matches above, loose matches on Subject: below --
2013-07-02 17:25 Tiziano Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox