Version bump; remove our patch.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 20 insertions, 155 deletions

diff --git a/dev-ruby/best_in_place/ChangeLog b/dev-ruby/best_in_place/ChangeLog
index 229dc07378ab..bf36dc42ceae 100644
--- a/dev-ruby/best_in_place/ChangeLog
+++ b/dev-ruby/best_in_place/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/best_in_place
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/best_in_place/ChangeLog,v 1.3 2012/01/23 18:45:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/best_in_place/ChangeLog,v 1.4 2012/01/24 10:38:54 flameeyes Exp $
+
+*best_in_place-1.0.6 (24 Jan 2012)
+
+  24 Jan 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +best_in_place-1.0.6.ebuild, -best_in_place-1.0.4-r1.ebuild,
+  -best_in_place-1.0.5.ebuild, -files/best_in_place-1.0.4-gentoo.patch:
+  Version bump; remove our patch.
 
 *best_in_place-1.0.5 (23 Jan 2012)
 
diff --git a/dev-ruby/best_in_place/Manifest b/dev-ruby/best_in_place/Manifest
index 749dab208df3..ae0696050e7d 100644
--- a/dev-ruby/best_in_place/Manifest
+++ b/dev-ruby/best_in_place/Manifest
@@ -1,17 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX best_in_place-1.0.4-gentoo.patch 2513 RMD160 62d38fad032bebd561a7dd4fb235c19df04b6d62 SHA1 947b2176bbc8a9f5424851f18cde48f16a40e039 SHA256 945c0f3e02dc0fb72456d278a4ddf3357c805deafab086c40fcf4f769ee4170a
-DIST best_in_place-1.0.4.gem 56832 RMD160 ccb3c88bd989b73c731987d8dbcae6e224edfa56 SHA1 aba5a95e07513c0b75e5297d61a4fff257bae965 SHA256 9abb4c2e3713bb1a4ded74924fbb23ee48e5abcef21adb245b906453bb1b2acd
-DIST best_in_place-1.0.5.gem 58368 RMD160 4c98317cc7795f7a170189660d0ec522accaddd5 SHA1 cb803d59b8f47d6d5f2c99a7797095cddcb6b2a1 SHA256 bc2ae968b2de854b44a7d5c4a5582a30c53ee9c0ae95f29c7aad37efa5a76780
-EBUILD best_in_place-1.0.4-r1.ebuild 1533 RMD160 7546e8a29943fb68cfa11cdaf7c659353802ede6 SHA1 326f253ba31ac25ffea875e1ff09d9e3739171c3 SHA256 588c5af66680ce18af28f2eb62884f71fd8046c6ff01d19369739e8c8ca26e41
-EBUILD best_in_place-1.0.5.ebuild 1537 RMD160 607b312aa39fc17afcaa66d9b6f39c326790aa84 SHA1 61306fef60ebb29cc19642e578bfa1a50c2ad0a0 SHA256 ca3bc7aa9417ad7433efe2819c4ae0f561746a900d8ba6dcaf7814558e340d0b
-MISC ChangeLog 987 RMD160 fd10f64b386801dfb0a7d8e74c3e78f3a316540c SHA1 6ec97c9ad9a2b56e7936b32b99920dbed7602681 SHA256 087a6ab64624f064561934e7b2b2646d38e9c77ce1c063d7c9a3836df5a1ae8d
+DIST best_in_place-1.0.6.gem 57856 RMD160 9c587f386feae4feddf87705358c43f62d946b1b SHA1 29893fecc3ae2192bd116f568f8ab142eb82a621 SHA256 6990c5ab3b0e175d7184d18aa06d8dfe0d81471988adcd0006687418d26bb468
+EBUILD best_in_place-1.0.6.ebuild 1455 RMD160 5ae6c852d5f22be8661e0e22047ab398e2f02061 SHA1 4ce846948ada8ebec048c43f493d6ddfc4707f28 SHA256 7cc730003ac739b06edfdcaa0d81aaf208c39e7f0b51de7859887090a617c0ed
+MISC ChangeLog 1249 RMD160 bb0e460f38ee0cb57d7f4157bef979ad18d08539 SHA1 e7e3d6d8c151948184b44f27568544ecd52b541b SHA256 ff342f25f9df032c5253b106226f5c296ed8d506a5e1015debd94eba7ef2dc2a
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8dqowACgkQAiZjviIA2XgixgCfcozB4QPm4vmPK+t+DNk3oh1G
-X6YAoIMLs9Zm5wgCPHWGucE+LXqakGr+
-=pr4A
+iEYEARECAAYFAk8eihgACgkQAiZjviIA2XheXwCglvo7JWr+KnuMmMzJv3rD6urd
+8YIAn2VlKOSLO3xtamnH69JNzGNtcryx
+=zOfg
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/best_in_place/best_in_place-1.0.5.ebuild b/dev-ruby/best_in_place/best_in_place-1.0.5.ebuild
deleted file mode 100644
index dffd61924814..000000000000
--- a/dev-ruby/best_in_place/best_in_place-1.0.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/best_in_place/best_in_place-1.0.5.ebuild,v 1.1 2012/01/23 18:45:05 flameeyes Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-# if ever needed
-#GITHUB_USER="bernat"
-#GITHUB_PROJECT="${PN}"
-#RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="In-place editor helper for Rails 3o"
-HOMEPAGE="http://github.com/bernat/best_in_place"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/rails:3.1
-	dev-ruby/jquery-rails
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rspec-rails
-		>=dev-ruby/nokogiri-1.5.0
-		>=dev-ruby/capybara-1.0.1
-		>=dev-ruby/sqlite3-ruby-1.3.4-r1
-		dev-ruby/rdiscount
-	)"
-
-DEPEND+=" test? ( www-client/firefox )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/git ls-files/d' \
-		-e '/rspec-rails/s:,.*::' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-	rm test_app/Gemfile.lock
-
-	# improve timing-resilience on two tests that would otherwise fail
-	# https://github.com/bernat/best_in_place/issues/87
-	# fix an issue with the :display_as option, that has been sent upstream
-	epatch "${FILESDIR}"/${PN}-1.0.4-gentoo.patch
-}
-
-each_ruby_test() {
-	RAILS_ENV=test ${RUBY} -C test_app -S rake db:migrate || die "test_app migration failed"
-	VIRTUALX_COMMAND="${RUBY}" virtualmake -S rake spec || die "Specs failed"
-}
diff --git a/dev-ruby/best_in_place/best_in_place-1.0.4-r1.ebuild b/dev-ruby/best_in_place/best_in_place-1.0.6.ebuild
index a571377d007b..42df3614cdb3 100644
--- a/dev-ruby/best_in_place/best_in_place-1.0.4-r1.ebuild
+++ b/dev-ruby/best_in_place/best_in_place-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/best_in_place/best_in_place-1.0.4-r1.ebuild,v 1.1 2012/01/21 13:27:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/best_in_place/best_in_place-1.0.6.ebuild,v 1.1 2012/01/24 10:38:54 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ree18"
@@ -48,12 +48,12 @@ all_ruby_prepare() {
 		-e '/git ls-files/d' \
 		-e '/rspec-rails/s:,.*::' \
 		${RUBY_FAKEGEM_GEMSPEC} || die
-	rm test_app/Gemfile.lock
 
-	# improve timing-resilience on two tests that would otherwise fail
-	# https://github.com/bernat/best_in_place/issues/87
-	# fix an issue with the :display_as option, that has been sent upstream
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	# let test_app work with Rails 3.1 (since we lack 3.2 for now).
+	sed -i \
+		-e '/gem .rails/s:3.2:~> 3.1:' \
+		-e '/gem .\(coffee\|sass\)/s:3\.2\..:3.1.0:' \
+		test_app/Gemfile || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/best_in_place/files/best_in_place-1.0.4-gentoo.patch b/dev-ruby/best_in_place/files/best_in_place-1.0.4-gentoo.patch
deleted file mode 100644
index d143d7eed1c9..000000000000
--- a/dev-ruby/best_in_place/files/best_in_place-1.0.4-gentoo.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/lib/best_in_place/helper.rb b/lib/best_in_place/helper.rb
-index 7ab2561..7d40f58 100644
---- a/lib/best_in_place/helper.rb
-+++ b/lib/best_in_place/helper.rb
-@@ -43,7 +43,7 @@ module BestInPlace
-       out << " data-type='#{opts[:type]}'"
-       out << " data-inner-class='#{opts[:inner_class]}'" if opts[:inner_class]
-       out << " data-html-attrs='#{opts[:html_attrs].to_json}'" unless opts[:html_attrs].blank?
--      out << " data-original-content='#{object.send(field)}'" if opts[:display_as] || opts[:display_with]
-+      out << " data-original-content='#{attribute_escape(object.send(field))}'" if opts[:display_as] || opts[:display_with]
-       if !opts[:sanitize].nil? && !opts[:sanitize]
-         out << " data-sanitize='false'>"
-         out << sanitize(value, :tags => %w(b i u s a strong em p h1 h2 h3 h4 h5 ul li ol hr pre span img br), :attributes => %w(id class href))
-@@ -80,6 +80,10 @@ module BestInPlace
-         object.send(field).to_s.presence || ""
-       end
-     end
-+
-+    def attribute_escape(data)
-+      data.to_s.gsub("&", "&amp;").gsub("'", "&apos;") unless data.nil?
-+    end
-   end
- end
- 
-diff --git a/spec/integration/js_spec.rb b/spec/integration/js_spec.rb
-index 38e09c8..e773108 100644
---- a/spec/integration/js_spec.rb
-+++ b/spec/integration/js_spec.rb
-@@ -466,15 +466,32 @@ describe "JS behaviour", :js => true do
- 
-         bip_text @user, :address, "New address"
- 
-+        sleep 1
-+
-         id = BestInPlace::Utils.build_best_in_place_id @user, :address
-         page.execute_script <<-JS
-           $("##{id}").click();
-         JS
- 
-+        sleep 1
-+
-         text = page.find("##{id} input").value
-         text.should == "New address"
-       end
-     end
-+
-+    it "should quote properly the data-original-content attribute" do
-+      @user.address = "A's & B's"
-+      @user.save!
-+      retry_on_timeout do
-+        visit user_path(@user)
-+
-+        id = BestInPlace::Utils.build_best_in_place_id @user, :address
-+
-+        text = page.find("##{id}")["data-original-content"]
-+        text.should == "A's & B's"
-+      end
-+    end
-   end
- 
-   describe "display_with" do
-@@ -534,11 +551,15 @@ describe "JS behaviour", :js => true do
- 
-         bip_text @user, :money, "40"
- 
-+        sleep 1
-+
-         id = BestInPlace::Utils.build_best_in_place_id @user, :money
-         page.execute_script <<-JS
-           $("##{id}").click();
-         JS
- 
-+        sleep 1
-+
-         text = page.find("##{id} input").value
-         text.should == "40"
-       end