Make it install properly the binary extension on Ruby Enterprise as well. Respect CFLAGS/LDFLAGS.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 35 insertions, 79 deletions

diff --git a/dev-ruby/tmail/ChangeLog b/dev-ruby/tmail/ChangeLog
index d516b6a225a8..5418f9679908 100644
--- a/dev-ruby/tmail/ChangeLog
+++ b/dev-ruby/tmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/tmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tmail/ChangeLog,v 1.12 2010/05/23 19:27:04 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tmail/ChangeLog,v 1.13 2010/07/29 02:34:32 flameeyes Exp $
+
+*tmail-1.2.7.1-r1 (29 Jul 2010)
+
+  29 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -tmail-1.2.3.1.ebuild, -tmail-1.2.7.1.ebuild, +tmail-1.2.7.1-r1.ebuild:
+  Make it install properly the binary extension on Ruby Enterprise as well.
+  Respect CFLAGS/LDFLAGS.
 
 *tmail-1.2.7.1 (23 May 2010)
 
diff --git a/dev-ruby/tmail/Manifest b/dev-ruby/tmail/Manifest
index ed3c18e13ca4..ed28502312c0 100644
--- a/dev-ruby/tmail/Manifest
+++ b/dev-ruby/tmail/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST tmail-1.2.3.1.gem 413184 RMD160 7a5657e6ae07405e0254157edd9b90a32969056e SHA1 e0fc65e1cb2853255a5addb4e1dfbe20238c351e SHA256 357171016ae9f33a3a214417865ba7f91f80203582f7e92ee0ef90c424bd3083
 DIST tmail-1.2.7.1.gem 446464 RMD160 e5f955be7413654313446f808f1dff2b4d133ee3 SHA1 409207eb0eba0e56c0002fc084ced9007f985f69 SHA256 9e4153e48c7f618ce6b22a44b5671ec5b9e49d16c693c3ee8b93397e9d78ca41
-EBUILD tmail-1.2.3.1.ebuild 1542 RMD160 7d5614cb434af640aa00972497baab4ce680fc9e SHA1 041c90a6fb8e32459c6378890229a066a9b5b88d SHA256 4d17b8c72222f8d84d07ea8dcee91bd3ac1fc8120d078b976fec0bb585dba703
-EBUILD tmail-1.2.7.1.ebuild 1657 RMD160 e6951d693d1e122d28d0088838301c7f91d2d828 SHA1 55bd6366dbea16c75da40fd19cd1956c42c20f83 SHA256 325756500c21a6326ab667a895afc65560d019ee8feab10da482a11adce5dbc1
-MISC ChangeLog 1514 RMD160 23996b1b3789c91d7ebac18679913c4c7df1f01f SHA1 b08df77e2d66cba46e3bda8a31dfb148d6300aef SHA256 1aa18f1a747abca3c782b726591a26fdab95fd64a095e748c74482545004a0f6
+EBUILD tmail-1.2.7.1-r1.ebuild 1938 RMD160 93b6003a5a377667bb79978bdc5dfa19af2ae554 SHA1 1e39f874f35efe9f397ef4f9c138e94698bcf281 SHA256 2a0670444592e04fee92f2fbaa4e43564b6b21c1b81e14d966a63e5a8514ba38
+MISC ChangeLog 1783 RMD160 2d0951738b1d71e4cc6106c5d63fdfa6e6e71912 SHA1 8c251c8e6d04676c1e206a88bfa7d6504360c73a SHA256 e7bcec9d9116e88cc101b41bc50191872ae1f8ddf8542fdc59adf398d4550b0d
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkv5gZIACgkQeM7EJeUH71OotwCffaTCKEtH2+BoDSMV9ksarMYu
-9NMAoJBUfYMK/3SVoK1LJx0nto8gxtMq
-=nIaM
+iEYEARECAAYFAkxQ6MsACgkQAiZjviIA2XjxpwCfWljkoBTFYHETJbzmK22t+daC
+J5IAoJFSYgd3SrPqUsxkvhJdFgXwCUOJ
+=ZSMt
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/tmail/tmail-1.2.3.1.ebuild b/dev-ruby/tmail/tmail-1.2.3.1.ebuild
deleted file mode 100644
index 24e3bf126c77..000000000000
--- a/dev-ruby/tmail/tmail-1.2.3.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tmail/tmail-1.2.3.1.ebuild,v 1.11 2010/05/22 22:40:08 a3li Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ree18 ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README CHANGES NOTES"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An email handling library"
-HOMEPAGE="http://rubyforge.org/projects/tmail/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-# Tests seem to be broken with the new encoding handling from Ruby,
-# need to be verified twice; code seems to work anyway.
-RESTRICT=test
-
-ruby_add_bdepend "
-	dev-ruby/racc
-	test? ( >=dev-ruby/mocha-0.9.5 )"
-
-each_ruby_compile() {
-	if [[ $(basename ${RUBY}) == "ruby18" ]]; then
-		pushd ext/tmailscanner/tmail
-		${RUBY} extconf.rb || die "extconf failed"
-		emake || die "emake extension failed"
-		popd
-	fi
-
-	emake -C lib/tmail $(use debug && echo DEBUG=true) parser.rb || die "emake failed"
-}
-
-each_ruby_install() {
-	# We cannot use the recursive install because there are
-	# racc source files and a makefile.
-	find lib -name '*.rb' | while read file; do
-		ruby_fakegem_newins $file $file
-	done
-
-	if [[ $(basename ${RUBY}) == "ruby18" ]]; then
-		ruby_fakegem_newins ext/tmailscanner/tmail/tmailscanner.so lib/tmail/tmailscanner.so
-	fi
-
-	ruby_fakegem_genspec
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc sample/* || die
-}
diff --git a/dev-ruby/tmail/tmail-1.2.7.1.ebuild b/dev-ruby/tmail/tmail-1.2.7.1-r1.ebuild
index aeeda203c386..829522703836 100644
--- a/dev-ruby/tmail/tmail-1.2.7.1.ebuild
+++ b/dev-ruby/tmail/tmail-1.2.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tmail/tmail-1.2.7.1.ebuild,v 1.1 2010/05/23 19:27:04 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tmail/tmail-1.2.7.1-r1.ebuild,v 1.1 2010/07/29 02:34:32 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -23,6 +23,10 @@ IUSE="debug"
 # need to be verified twice; code seems to work anyway.
 RESTRICT=test
 
+# Once it's added to portage, this should be added, right now it's
+# bundled.
+# ruby_add_rdepend dev-ruby/rchardet
+
 ruby_add_bdepend "
 	dev-ruby/racc
 	test? ( >=dev-ruby/mocha-0.9.5 )"
@@ -33,15 +37,23 @@ all_ruby_prepare() {
 	echo "tmail" > meta/unixname || die "Failed to create unixname file."
 }
 
-each_ruby_compile() {
-	if [[ $(basename ${RUBY}) == "ruby18" ]]; then
-		pushd ext/tmailscanner/tmail
-		${RUBY} extconf.rb || die "extconf failed"
-		emake || die "emake extension failed"
-		popd
-	fi
+each_ruby_configure() {
+	case ${RUBY} in
+		*ruby18 | *rubyee18)
+			${RUBY} -Cext/tmailscanner/tmail extconf.rb || die "extconf failed"
+			;;
+	esac
+}
 
+each_ruby_compile() {
 	emake -C lib/tmail $(use debug && echo DEBUG=true) parser.rb || die "emake failed"
+
+	case ${RUBY} in
+		*ruby18 | *rubyee18)
+			emake -Cext/tmailscanner/tmail extconf.rb \
+				CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" || die "emake extension failed"
+			;;
+	esac
 }
 
 each_ruby_install() {
@@ -51,9 +63,8 @@ each_ruby_install() {
 		ruby_fakegem_newins $file $file
 	done
 
-	if [[ $(basename ${RUBY}) == "ruby18" ]]; then
+	[[ -f ext/tmailscanner/tmail/tmailscanner.so ]] && \
 		ruby_fakegem_newins ext/tmailscanner/tmail/tmailscanner.so lib/tmail/tmailscanner.so
-	fi
 
 	ruby_fakegem_genspec
 }