Bump sunstudio. Versioning changes, so this looks like a downgrade.

5 files changed, 76 insertions, 62 deletions

diff --git a/dev-lang/sunstudio/Manifest b/dev-lang/sunstudio/Manifest
index 05d50e9..cc23d30 100644
--- a/dev-lang/sunstudio/Manifest
+++ b/dev-lang/sunstudio/Manifest
@@ -1,8 +1,8 @@
-DIST StudioExpress-linux-2006-08.tar.bz2 220743971 RMD160 792896d3f209eed7667448e2944d7d3ebf0ff07e SHA1 89287b71ad49afd025c10e9c0a5c95dae95b1a19 SHA256 01f944242a3ea67cc17799eb3e42f1dfc5bc533b0af1c8de2c030a241be41dca
-EBUILD sunstudio-200608.ebuild 1333 RMD160 ee8c924bdb22cc9d77783f0f2f5e6759fd0c08e2 SHA1 6fb9410e459839fc5c66ba674338b1ced3fcfd2e SHA256 7c2408a138b2d9042f4d3810562705c88ff46a0ae6b35131582dce878c014660
-MD5 d3af8833e31ef84fa0a218c5c3982214 sunstudio-200608.ebuild 1333
-RMD160 ee8c924bdb22cc9d77783f0f2f5e6759fd0c08e2 sunstudio-200608.ebuild 1333
-SHA256 7c2408a138b2d9042f4d3810562705c88ff46a0ae6b35131582dce878c014660 sunstudio-200608.ebuild 1333
-MD5 2164c605442881a1ba5f88d2beb2e6a0 files/digest-sunstudio-200608 295
-RMD160 839110b8fb5862001bc697f53cd10f4720084136 files/digest-sunstudio-200608 295
-SHA256 21bb0400506bd0c8a260faafa58ebb82ac4f054d38211cca6922fbb056c4c4a7 files/digest-sunstudio-200608 295
+DIST SunStudio12-linux-x86-200705-ii.tar.bz2 260292216 RMD160 cae5cac5e1441584abb00a32823437232b247d4c SHA1 416333be48ce5b6808fcdbf83bf102b80752046a SHA256 a9b511d119a2a8f10364e82ff1cd6a1c543d83191bba81bfe9e518d890f699b0
+EBUILD sunstudio-12_p200705.ebuild 1708 RMD160 63ec07af468a8fb60e974b2e30775cca560722d6 SHA1 1c08dec2bf21da2e8d76760f6c1337be2e42d021 SHA256 40df3bfb5b6b5ac9e99ee7574f90980468cb3f72f235199f9205b963371193ed
+MD5 f5f93f2b05cd35add3e784819f6c926d sunstudio-12_p200705.ebuild 1708
+RMD160 63ec07af468a8fb60e974b2e30775cca560722d6 sunstudio-12_p200705.ebuild 1708
+SHA256 40df3bfb5b6b5ac9e99ee7574f90980468cb3f72f235199f9205b963371193ed sunstudio-12_p200705.ebuild 1708
+MD5 ebf4cc7d2917dd72dd21a5ec233d6022 files/digest-sunstudio-12_p200705 307
+RMD160 0e89ee6db50d769298b10e35cbf8af970a3e0dc2 files/digest-sunstudio-12_p200705 307
+SHA256 cb2be1bfac9f2d21bc50f797ef83b3c94c6c1f4c5c6407eb6348c0c9d45eff2a files/digest-sunstudio-12_p200705 307
diff --git a/dev-lang/sunstudio/files/digest-sunstudio-12_p200705 b/dev-lang/sunstudio/files/digest-sunstudio-12_p200705
new file mode 100644
index 0000000..9c02461
--- /dev/null
+++ b/dev-lang/sunstudio/files/digest-sunstudio-12_p200705
@@ -0,0 +1,3 @@
+MD5 1cba9e4b5bdcbd45d8d921d447292e15 SunStudio12-linux-x86-200705-ii.tar.bz2 260292216
+RMD160 cae5cac5e1441584abb00a32823437232b247d4c SunStudio12-linux-x86-200705-ii.tar.bz2 260292216
+SHA256 a9b511d119a2a8f10364e82ff1cd6a1c543d83191bba81bfe9e518d890f699b0 SunStudio12-linux-x86-200705-ii.tar.bz2 260292216
diff --git a/dev-lang/sunstudio/files/digest-sunstudio-200608 b/dev-lang/sunstudio/files/digest-sunstudio-200608
deleted file mode 100644
index 3e1c484..0000000
--- a/dev-lang/sunstudio/files/digest-sunstudio-200608
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aee64ced0fd9b5957df00a8253fbf0d0 StudioExpress-linux-2006-08.tar.bz2 220743971
-RMD160 792896d3f209eed7667448e2944d7d3ebf0ff07e StudioExpress-linux-2006-08.tar.bz2 220743971
-SHA256 01f944242a3ea67cc17799eb3e42f1dfc5bc533b0af1c8de2c030a241be41dca StudioExpress-linux-2006-08.tar.bz2 220743971
diff --git a/dev-lang/sunstudio/sunstudio-12_p200705.ebuild b/dev-lang/sunstudio/sunstudio-12_p200705.ebuild
new file mode 100644
index 0000000..133959d
--- /dev/null
+++ b/dev-lang/sunstudio/sunstudio-12_p200705.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# Installation README:
+# http://developers.sun.com/sunstudio/downloads/tarfile_info.html
+
+inherit versionator
+
+MY_PN="SunStudio"
+MY_TAG="-ii"
+PV_VER=$(get_version_component_range 1 ${PV})
+PV_DATE=$(get_version_component_range 2 ${PV})
+# Can't figure out how to make this generic to pre, p, rc, etc..
+PV_DATE=${PV_DATE#p}
+MY_P="${MY_PN}${PV_VER}-linux-x86-${PV_DATE}${MY_TAG}"
+DESCRIPTION="Sun Studio Compilers for Linux"
+HOMEPAGE="http://developers.sun.com/sunstudio/downloads/index.jsp"
+RESTRICT="fetch"
+SRC_URI="${MY_P}.tar.bz2"
+# Change to the actual license if adding to the tree
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+# dev-util/netbeans-cnd is in java-overlay, but doesn't seem to work
+RDEPEND="!amd64? ( virtual/libstdc++ )
+	amd64? ( app-emulation/emul-linux-x86-compat )
+	sys-libs/zlib
+	=virtual/jre-1.5*
+	=dev-util/netbeans-5.5*"
+DEPEND=""
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Go to ${HOMEPAGE}"
+	einfo "and download ${SRC_URI}"
+}
+
+pkg_setup() {
+	if ! [ -d "${ROOT}"usr/share/netbeans-5.5/cnd1 ]; then
+		local msg="You must install the C/C++ pack from http://www.netbeans.org/products/cplusplus/ as root"
+		eerror "$msg"
+		die "$msg"
+	fi
+}
+
+src_install() {
+	DIR="/opt/sun/sunstudio12"
+
+	dodir /opt/sun
+	cp -r sunstudio12 "${D}"/opt/sun/
+
+	# Set SUNW_NO_UPDATE_NOTIFY to anything but false to disable writes
+	# to /root/.sunstudio
+	# These writes break the sandbox when building anything with Sun compilers
+	cat << EOF >> ${T}/envd
+ROOTPATH="${DIR}/bin"
+PATH="${DIR}/bin"
+MANPATH="${DIR}/man"
+SUNW_NO_UPDATE_NOTIFY="true"
+EOF
+
+	newenvd ${T}/envd 05${PN}
+}
diff --git a/dev-lang/sunstudio/sunstudio-200608.ebuild b/dev-lang/sunstudio/sunstudio-200608.ebuild
deleted file mode 100644
index 7fcd5b7..0000000
--- a/dev-lang/sunstudio/sunstudio-200608.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Installation README:
-# http://developers.sun.com/sunstudio/downloads/express_readme.html
-
-MY_PN="StudioExpress-linux"
-MY_PV="${PV:0:4}-${PV:4:2}"
-MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="Sun Studio Compilers for Linux - technology preview"
-HOMEPAGE="http://developers.sun.com/sunstudio/downloads/express.jsp"
-RESTRICT="fetch"
-SRC_URI="${MY_P}.tar.bz2"
-# Change to the actual license if adding to the tree
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-# It bundles an old NetBeans that has cpp.jar. Newer versions (all in portage)
-# dropped this in favor of a new setup.
-# dev-util/netbeans
-RDEPEND="!amd64? ( virtual/libstdc++ )
-	amd64? ( app-emulation/emul-linux-x86-compat )
-	sys-libs/zlib
-	>=virtual/jre-1.4"
-DEPEND=""
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Go to ${HOMEPAGE}"
-	einfo "and download ${SRC_URI}"
-}
-
-src_install() {
-	DIR="/opt/sun/sunstudiomars"
-
-	cp -r opt "${D}"
-
-	# Set SUNW_NO_UPDATE_NOTIFY to anything but false to disable writes
-	# to /root/.sunstudio
-	# These writes break the sandbox when building anything with Sun compilers
-	cat << EOF >> ${T}/envd
-ROOTPATH="${DIR}/bin"
-PATH="${DIR}/bin"
-MANPATH="${DIR}/man"
-SUNW_NO_UPDATE_NOTIFY="true"
-EOF
-
-	newenvd ${T}/envd 05${PN}
-}