MAJORMINOR

svn path=/; revision=61

1 files changed, 14 insertions, 10 deletions

diff --git a/dev-lang/ruby/ruby-1.8.6.9999.ebuild b/dev-lang/ruby/ruby-1.8.6.9999.ebuild
index 688723c..fa6cef0 100644
--- a/dev-lang/ruby/ruby-1.8.6.9999.ebuild
+++ b/dev-lang/ruby/ruby-1.8.6.9999.ebuild
@@ -12,11 +12,15 @@ inherit autotools eutils flag-o-matic multilib subversion versionator
 ESVN_REPO_URI="http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6"
 ESVN_PROJECT="ruby"
 
-MY_PV=$(get_version_component_range 1-3)
+MAJOR_MINOR=$(get_version_component_range 1-2)
+MAJOR_MINOR_POINT=$(get_version_component_range 1-3)
+
+MY_P="${PN}-${MAJOR_MINOR_POINT}"
 S=${WORKDIR}/${MY_P}
 
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+SLOT=$MAJOR_MINOR
+
+MY_SUFFIX=$(delete_version_separator 1 ${MAJOR_MINOR})
 
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="http://www.ruby-lang.org/"
@@ -32,7 +36,7 @@ RDEPEND=">=sys-libs/gdbm-1.8.0
 	socks5? ( >=net-proxy/dante-1.1.13 )
 	tk? ( dev-lang/tk )
 	>=dev-ruby/ruby-config-0.3.1
-	!=dev-lang/ruby-cvs-${SLOT}*
+	!=dev-lang/ruby-cvs-${MAJOR_MINOR}*
 	!dev-ruby/rdoc
 	!dev-ruby/rexml"
 DEPEND="${RDEPEND}"
@@ -115,7 +119,7 @@ src_test() {
 	elog
 	if use rubytests; then
 		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "/usr/share/${PN}-${MAJOR_MINOR}/test. To run them you must be a user other"
 		elog "than root, and you must place them into a writeable directory."
 		elog "Then call: "
 		elog
@@ -127,7 +131,7 @@ src_test() {
 
 src_install() {
 	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}"
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${MAJOR_MINOR}"
 	for d in $(find "${S}/ext" -type d) ; do
 		RUBYLIB="${RUBYLIB}:$d"
 	done
@@ -148,14 +152,14 @@ src_install() {
 		cp -pPR sample "${D}/usr/share/doc/${PF}"
 	fi
 
-	dosym libruby$MY_SUFFIX$(get_libname ${MY_PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${MY_PV%.*})
-	dosym libruby$MY_SUFFIX$(get_libname ${MY_PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${MY_PV%_*})
+	dosym libruby$MY_SUFFIX$(get_libname $MAJOR_MINOR_POINT) /usr/$(get_libdir)/libruby$(get_libname $MAJOR_MINOR)
+	dosym libruby$MY_SUFFIX$(get_libname $MAJOR_MINOR_POINT) /usr/$(get_libdir)/libruby$(get_libname $MAJOR_MINOR_POINT)
 
 	dodoc ChangeLog NEWS README* ToDo
 
 	if use rubytests; then
-		dodir /usr/share/${PN}-${SLOT}
-		cp -pPR test "${D}/usr/share/${PN}-${SLOT}"
+		dodir /usr/share/${PN}-${MAJOR_MINOR}
+		cp -pPR test "${D}/usr/share/${PN}-${MAJOR_MINOR}"
 	fi
 }