Remove old version using ruby.eclass. Use $FILESDIR for patch name.

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

4 files changed, 14 insertions, 71 deletions

diff --git a/dev-ruby/ruby-dbi/ChangeLog b/dev-ruby/ruby-dbi/ChangeLog
index 13083171a459..bf0c6d1a6086 100644
--- a/dev-ruby/ruby-dbi/ChangeLog
+++ b/dev-ruby/ruby-dbi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ruby-dbi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-dbi/ChangeLog,v 1.45 2010/06/15 18:04:03 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-dbi/ChangeLog,v 1.46 2010/08/16 23:16:03 flameeyes Exp $
+
+  16 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ruby-dbi-0.4.2.ebuild, ruby-dbi-0.4.3.ebuild:
+  Remove old version using ruby.eclass. Use $FILESDIR for patch name.
 
 *ruby-dbi-0.4.3 (15 Jun 2010)
 
diff --git a/dev-ruby/ruby-dbi/Manifest b/dev-ruby/ruby-dbi/Manifest
index c7e1049c4b19..ee53546f1f95 100644
--- a/dev-ruby/ruby-dbi/Manifest
+++ b/dev-ruby/ruby-dbi/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX ruby-dbi-0.1.1-destdir-gentoo.diff 759 RMD160 3bc32a3cf3effc608db7c325855a076e9715a766 SHA1 52033c8477fb4d98a688b230bb95557f29e68876 SHA256 e38fe6006c9ef6612c3aae0b252687a5924eba5d82007d9fec729bb50409f9b1
 AUX ruby-dbi-0.4.3-drivers-test.patch 732 RMD160 b201b65caab4df0451f71436869fcf4fd79bc9fc SHA1 05f5d32e4d493addbcca30e4ee36b40bca663568 SHA256 e137a0e1a79d32fb801e113d39bdd8cdccb4a5c911111a0c312dce95d00ba05d
 AUX ruby-dbi-destdir-gentoo.diff 273 RMD160 f2791a246d6a29854468f34c16da801d60642d4b SHA1 136d5e2d525765ecd03288ef127925462ca251ac SHA256 a6c45268928fba70fbe67bf704f8d285f1c3ab97e63f5345524740ec1c4b7c04
 DIST dbi-0.2.0.tar.gz 100090 RMD160 a6fce82920f5953222c0069156784738dd71d505 SHA1 d21994329b48a63ac9f63be6f4504955610170a8 SHA256 2db880fb0abb87aac5da76d6ba92c614111b4606e5b6d87e56c70d5b1170b636
-DIST dbi-0.4.2.tar.gz 81477 RMD160 77d580d8edb89a14fc0a16d7935a698b1aa5e561 SHA1 9985536191d4fa640f6e7872dd195f993db0cd59 SHA256 1e027d981899bf280f62868beb136604f680d5f2e3a4d2a181bfe6f66df382d1
 DIST dbi-0.4.3.tar.gz 81851 RMD160 77d90ef34a6fa21ac7124a23bb239983255fe29a SHA1 0567fc2fd09733c98e9dda426ef141fc245366a5 SHA256 5f4d0c92c43ccfc4d0075dfe17e3315a2d2d8aaeaee207a81985dd7be75f45fa
 EBUILD ruby-dbi-0.2.0-r1.ebuild 1625 RMD160 b858de0ddf5d38168e5c6b5ce0dcef39a4f98473 SHA1 d14463ce7d46fbde693e7abdf5d437b75204176b SHA256 8a601b6bb2f6fa38a7e67d8b1f3f1cc4302dafa206a1725ac3563310a8e433c9
-EBUILD ruby-dbi-0.4.2.ebuild 1586 RMD160 81c39cc436fe941406f3d8e8cc594743f871bd37 SHA1 7ad266c8aa3ab2377c9420a4df0f9f93693ba545 SHA256 8a7c0027bc78c00bdb06e525d70bdaa80a6645a18d9478f60c5354cd3f10dcd8
-EBUILD ruby-dbi-0.4.3.ebuild 1651 RMD160 0ebc0b775211f22a73b8d801a1c46cd8f02986b7 SHA1 667b3847a2dd9f5ea3ae71b0aea9d04d2bbff1fb SHA256 476f2c72b814b47486de39d05f28d41ab43bba8b3da6cac37a462d4e48bf9a14
-MISC ChangeLog 6545 RMD160 b52477dfa6a1dc7e7804e58d39b927db365186c1 SHA1 c33f296958fdb00980c6174e4eece39cb95dd0a4 SHA256 a6d85b2795ac75b19e01168af911dff6d144adcc38abf5e9a4f45d9721652689
+EBUILD ruby-dbi-0.4.3.ebuild 1666 RMD160 b253d658fe54ed838dcfe2f2f6cc414b6745275f SHA1 9430c9cdbc436486be9c7862a94491cd9226deb7 SHA256 d45243902b1e39df35ffbf3c1256e01c6fc6cdfeac9db7f76510ee84fde1aa10
+MISC ChangeLog 6724 RMD160 aae4f015c8ebe41098624ee4113cdd921e4f97ca SHA1 80bb1dc302cd267112c7ffe6d96194b37c1baff3 SHA256 7efe409b3e455ae6a6f900ea790acf0b4bf4b01e168620dca8ea0155738c553c
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkwXwJ4ACgkQZihJkut28SvUKAD/W91IISjP+kS04qGaVUs8oJyh
-yaAKDUaIsIs9sj5Jsy0BALb/kYirqf50CYB6x8K9SBG1GERryMFTg366A/Rz1ec8
-=iDE3
+iEYEARECAAYFAkxpxo8ACgkQAiZjviIA2XiqqgCgnQjUIKU6G2GXhjedNTkPvcM+
+uqEAnj/8K3ThTRJt8IJ8Pvg/fxL6wV6w
+=Vr7p
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-dbi/ruby-dbi-0.4.2.ebuild b/dev-ruby/ruby-dbi/ruby-dbi-0.4.2.ebuild
deleted file mode 100644
index ed5f58193296..000000000000
--- a/dev-ruby/ruby-dbi/ruby-dbi-0.4.2.ebuild
+++ /dev/null
@@ -1,59 +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/ruby-dbi/ruby-dbi-0.4.2.ebuild,v 1.8 2010/05/22 15:44:09 flameeyes Exp $
-
-inherit "ruby"
-
-MY_P=${P##ruby-}
-
-DESCRIPTION="Ruby/DBI - a database independent interface for accessing databases - similar to Perl's DBI"
-HOMEPAGE="http://ruby-dbi.rubyforge.org"
-SRC_URI="mirror://rubyforge/ruby-dbi/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="examples odbc postgres mysql sqlite sqlite3 test"
-
-DEPEND="
-	dev-ruby/deprecated
-	test? ( virtual/ruby-test-unit )"
-RDEPEND="${DEPEND}"
-PDEPEND="
-	mysql?    ( dev-ruby/dbd-mysql )
-	postgres? ( dev-ruby/dbd-pg )
-	odbc?     ( dev-ruby/dbd-odbc )
-	sqlite?   ( dev-ruby/dbd-sqlite )
-	sqlite3?  ( dev-ruby/dbd-sqlite3 )"
-
-S="${WORKDIR}/${MY_P}"
-USE_RUBY="ruby18"
-
-src_test() {
-	for rb in $USE_RUBY; do
-		[ -n "$(type -p ${rb})" ] || continue
-		ebegin "Testing for ${rb}"
-		${rb} setup.rb test || die "test failed"
-		eend $?
-	done
-}
-
-src_install() {
-	ruby setup.rb install \
-		--prefix="${D}" || die "setup.rb install failed"
-
-	dodoc README
-
-	if use examples ; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "cp examples failed"
-	fi
-}
-
-pkg_postinst() {
-	if ! (use mysql || use postgres || use odbc || use sqlite || use sqlite3)
-	then
-		elog "${P} now comes with external database drivers."
-		elog "Be sure to set the right USE flags for ${PN} or emerge the drivers manually:"
-		elog "They are called dev-ruby/dbd-{mysql,odbc,pg,sqlite,sqlite3}"
-	fi
-}
diff --git a/dev-ruby/ruby-dbi/ruby-dbi-0.4.3.ebuild b/dev-ruby/ruby-dbi/ruby-dbi-0.4.3.ebuild
index 96a148e1b16c..a5d379d22b5a 100644
--- a/dev-ruby/ruby-dbi/ruby-dbi-0.4.3.ebuild
+++ b/dev-ruby/ruby-dbi/ruby-dbi-0.4.3.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/ruby-dbi/ruby-dbi-0.4.3.ebuild,v 1.1 2010/06/15 18:04:03 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-dbi/ruby-dbi-0.4.3.ebuild,v 1.2 2010/08/16 23:16:03 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18"
@@ -30,7 +30,7 @@ PDEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
-RUBY_PATCHES=( "${P}-drivers-test.patch" )
+RUBY_PATCHES=( "${FILESDIR}/${P}-drivers-test.patch" )
 
 each_ruby_configure() {
 	${RUBY} setup.rb config --prefix=/usr