[patch] Fixes to ebuilds for eselect

eselect-rails-fixes-to-ebuilds.patch (text/plain), 3.54 KB, created by Mark Somerville on 2008-07-02 23:08:28 UTC

diff -ur /usr/portage/dev-ruby/rails/rails-1.1.6-r2.ebuild ./rails-1.1.6-r2.ebuild
--- /usr/portage/dev-ruby/rails/rails-1.1.6-r2.ebuild	2007-09-03 22:36:01.000000000 +0100
+++ ./rails-1.1.6-r2.ebuild	2008-07-02 21:58:59.000000000 +0100
@@ -35,15 +35,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"
-	eselect rails update ${SLOT}
+	eselect rails update
 }
 
 pkg_postrm() {
-	eselect rails update ${SLOT}
+	if [ -n "`eselect rails list` | grep 'none found'" ]; then
+		rm -f /usr/bin/rails
+	fi
+	eselect rails update
 }
diff -ur /usr/portage/dev-ruby/rails/rails-1.2.6.ebuild ./rails-1.2.6.ebuild
--- /usr/portage/dev-ruby/rails/rails-1.2.6.ebuild	2007-12-01 23:06:04.000000000 +0000
+++ ./rails-1.2.6.ebuild	2008-07-02 21:58:59.000000000 +0100
@@ -34,15 +34,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"
-	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 -ur /usr/portage/dev-ruby/rails/rails-2.0.2.ebuild ./rails-2.0.2.ebuild
--- /usr/portage/dev-ruby/rails/rails-2.0.2.ebuild	2008-05-16 19:05:53.000000000 +0100
+++ ./rails-2.0.2.ebuild	2008-07-02 21:58:59.000000000 +0100
@@ -30,6 +30,7 @@
 	# 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}"
 }
 
@@ -37,12 +38,14 @@
 	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
+	if [ -n "`eselect rails list` | grep 'none found'" ]; then
+		rm -f /usr/bin/rails
+	fi
+	eselect rails update
 }
diff -ur /usr/portage/dev-ruby/rails/rails-2.1.0.ebuild ./rails-2.1.0.ebuild
--- /usr/portage/dev-ruby/rails/rails-2.1.0.ebuild	2008-06-17 06:44:06.000000000 +0100
+++ ./rails-2.1.0.ebuild	2008-07-02 21:58:59.000000000 +0100
@@ -30,6 +30,7 @@
 	# 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}"
 }
 
@@ -37,12 +38,14 @@
 	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
 }