[patch] Patch to be applied against dev-ruby/rails/ in the Portage tree

dev-ruby-rails.patch (text/plain), 3.47 KB, created by Alex Legler (RETIRED) on 2008-12-01 20:58:42 UTC

diff -ru a/rails-1.2.6.ebuild b/rails-1.2.6.ebuild
--- a/rails-1.2.6.ebuild	2007-12-02 00:06:04.000000000 +0100
+++ b/rails-1.2.6.ebuild	2008-12-01 21:40:38.000000000 +0100
@@ -34,15 +34,20 @@
 	# Rename slotted files that may clash so that eselect can handle
 	# them
 	mv ${D}/usr/bin/rails ${D}/usr/bin/rails-${PV}
+	sed -i -e "s/>= 0/${PV}/" "${D}/usr/bin/rails-${PV}"
 	mv ${D}/${GEMSDIR}/bin/rails ${D}/${GEMSDIR}/bin/rails-${PV}
 }
 
 pkg_postinst() {
 	einfo "To select between slots of rails, use:"
 	einfo "\teselect rails"
-	eselect rails update --if-unset
+	eselect rails update
 }
 
 pkg_postrm() {
 	eselect rails update --if-unset
+	if [ -n "`eselect rails list` | grep 'none found'" ]; then
+		rm -f /usr/bin/rails
+	fi
+	eselect rails update
 }
diff -ru a/rails-2.0.5.ebuild b/rails-2.0.5.ebuild
--- a/rails-2.0.5.ebuild	2008-11-15 19:35:46.000000000 +0100
+++ b/rails-2.0.5.ebuild	2008-12-01 21:41:23.000000000 +0100
@@ -30,19 +30,22 @@
 	# Rename slotted files that may clash so that eselect can handle
 	# them
 	mv "${D}/usr/bin/rails" "${D}/usr/bin/rails-${PV}"
+	sed -i -e "s/>= 0/${PV}/" "${D}/usr/bin/rails-${PV}"
 	mv "${D}/${GEMSDIR}/bin/rails" "${D}/${GEMSDIR}/bin/rails-${PV}"
 }
 
 pkg_postinst() {
 	einfo "To select between slots of rails, use:"
 	einfo "\teselect rails"
-	# Bring users to rails 2.0.x by default when updating
-	eselect rails update 2
+	eselect rails update
 
 	ewarn "All database USE flags have been moved to dev-ruby/activerecord"
 }
 
 pkg_postrm() {
-	# Drop users back to rails 1.2.x when they remove 2.0.x
-	eselect rails update 1.2
+	eselect rails update --if-unset
+	if [ -n "`eselect rails list` | grep 'none found'" ]; then
+		rm -f /usr/bin/rails
+	fi
+	eselect rails update
 }
diff -ru a/rails-2.1.2.ebuild b/rails-2.1.2.ebuild
--- a/rails-2.1.2.ebuild	2008-11-15 19:35:46.000000000 +0100
+++ b/rails-2.1.2.ebuild	2008-12-01 21:42:00.000000000 +0100
@@ -30,19 +30,21 @@
 	# Rename slotted files that may clash so that eselect can handle
 	# them
 	mv "${D}/usr/bin/rails" "${D}/usr/bin/rails-${PV}"
+	sed -i -e "s/>= 0/${PV}/" "${D}/usr/bin/rails-${PV}"
 	mv "${D}/${GEMSDIR}/bin/rails" "${D}/${GEMSDIR}/bin/rails-${PV}"
 }
 
 pkg_postinst() {
 	einfo "To select between slots of rails, use:"
 	einfo "\teselect rails"
-	# Bring users to rails 2.1.x by default when updating
-	eselect rails update 2.1
+	eselect rails update
 
 	ewarn "All database USE flags have been moved to dev-ruby/activerecord"
 }
 
 pkg_postrm() {
-	# Drop users back to rails 2.0.x when they remove 2.1.x
-	eselect rails update 2
+	if [ -n "`eselect rails list` | grep 'none found'" ]; then
+		rm -f /usr/bin/rails
+	fi
+	eselect rails update
 }
diff -ru a/rails-2.2.2.ebuild b/rails-2.2.2.ebuild
--- a/rails-2.2.2.ebuild	2008-11-27 07:59:53.000000000 +0100
+++ b/rails-2.2.2.ebuild	2008-12-01 21:42:28.000000000 +0100
@@ -29,17 +29,19 @@
 	# Rename slotted files that may clash so that eselect can handle
 	# them
 	mv "${D}/usr/bin/rails" "${D}/usr/bin/rails-${PV}"
+	sed -i -e "s/>= 0/${PV}/" "${D}/usr/bin/rails-${PV}"	
 	mv "${D}/${GEMSDIR}/bin/rails" "${D}/${GEMSDIR}/bin/rails-${PV}"
 }
 
 pkg_postinst() {
 	einfo "To select between slots of rails, use:"
 	einfo "\teselect rails"
-	# Bring users to rails 2.2.x by default when updating
-	eselect rails update 2.2
+	eselect rails update
 }
 
 pkg_postrm() {
-	# Drop users back to rails 2.1.x when they remove 2.2.x
-	eselect rails update 2.1
+	if [ -n "`eselect rails list` | grep 'none found'" ]; then
+		rm -f /usr/bin/rails
+	fi
+	eselect rails update
 }