Split debugger into dev-lang/idb, remove IA32ROOT env, added more log comments.

Package-Manager: portage-2.1.3.9

5 files changed, 47 insertions, 78 deletions

diff --git a/dev-lang/ifc/ChangeLog b/dev-lang/ifc/ChangeLog
index 052f4d5207f0..eb56b47cb3f3 100644
--- a/dev-lang/ifc/ChangeLog
+++ b/dev-lang/ifc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ifc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ChangeLog,v 1.27 2007/09/30 10:34:44 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ChangeLog,v 1.28 2007/10/02 11:33:05 bicatali Exp $
+
+*ifc-10.0.026-r1 (02 Oct 2007)
+
+  02 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
+  -ifc-10.0.026.ebuild, +ifc-10.0.026-r1.ebuild:
+  Split debugger into dev-lang/idb, remove IA32ROOT env, added more log comments.
 
 *ifc-10.0.026 (30 Sep 2007)
 
diff --git a/dev-lang/ifc/Manifest b/dev-lang/ifc/Manifest
index 355c514a140a..182519590292 100644
--- a/dev-lang/ifc/Manifest
+++ b/dev-lang/ifc/Manifest
@@ -9,32 +9,32 @@ DIST l_fc_c_10.0.026_ia32.tar.gz 40048235 RMD160 31272a3c579fca552de1991036fb221
 DIST l_fc_c_10.0.026_ia64.tar.gz 67048117 RMD160 50ece4d17023a39d99522af2738a8a1885fef483 SHA1 b125c44feb513ff1223d051f40cf1e791a5369d3 SHA256 d9a5938681bacabb5fbc612f23b0870b1d74375735a357c2e943aa8da04330dc
 DIST l_fc_c_10.0.026_intel64.tar.gz 41346217 RMD160 207cdd1bc81357e3631c38c5609f37f73f585ab5 SHA1 686db50a774b82c85e02fa7767deddedc5b2520c SHA256 f2f306334ce47c6a778e1da21256a958aeb8d285740f35630567f9dc2a49e7f9
 DIST l_fc_c_9.1.040.tar.gz 139611995 RMD160 81e703df4273b095a9944064586a30f5f41caa96 SHA1 8235806904d8662d6179ff4a8fed46503f623ccb SHA256 907ee053eeaacac332b0f3fdb408d662b1e1d42a33a02a2916e7563888765a1c
-EBUILD ifc-10.0.026.ebuild 3657 RMD160 27ba1322d8184f1445e5766e3036aaef6b250844 SHA1 5688ae14fde2e070c4878a59d77b29b91d068528 SHA256 a180c06431ff8ea7deb19a87863d926dcd383d067f2137af1180984303ca3aab
-MD5 cbffbc059602d9969a471fe60cf2c961 ifc-10.0.026.ebuild 3657
-RMD160 27ba1322d8184f1445e5766e3036aaef6b250844 ifc-10.0.026.ebuild 3657
-SHA256 a180c06431ff8ea7deb19a87863d926dcd383d067f2137af1180984303ca3aab ifc-10.0.026.ebuild 3657
+EBUILD ifc-10.0.026-r1.ebuild 2813 RMD160 614888f6de8482a7f8dee9ba0095c1dabbf34262 SHA1 aa50b1159fafff36638b85bc036fb4749ac96b8b SHA256 5d0435ecff0e3695274f733bf8359fc7a3213b0172025c1140043c751b154feb
+MD5 c7abbf016a1fd5fd3abe8159f06adf6c ifc-10.0.026-r1.ebuild 2813
+RMD160 614888f6de8482a7f8dee9ba0095c1dabbf34262 ifc-10.0.026-r1.ebuild 2813
+SHA256 5d0435ecff0e3695274f733bf8359fc7a3213b0172025c1140043c751b154feb ifc-10.0.026-r1.ebuild 2813
 EBUILD ifc-9.1.040.ebuild 3258 RMD160 5ab1c3e26b84ba47807aac9799e0edc1577a928d SHA1 af97ef7f416b9528183aa5a06c764cd5b3c898b6 SHA256 487f4639c459475e17f34ee1a148ccc208759b1ca3e22265ec689f5800db2734
 MD5 c892d301f06397a1b4f865efd8a13f66 ifc-9.1.040.ebuild 3258
 RMD160 5ab1c3e26b84ba47807aac9799e0edc1577a928d ifc-9.1.040.ebuild 3258
 SHA256 487f4639c459475e17f34ee1a148ccc208759b1ca3e22265ec689f5800db2734 ifc-9.1.040.ebuild 3258
-MISC ChangeLog 2519 RMD160 8aa7d338521d9d255c8519cc03ea5854ee713380 SHA1 19aaa73272f5ee6fbafd96556f8d7e0d7e273ec7 SHA256 360f2baaa5237378f405ce77c30f6a8288c23996bc3001a1c642ee55c03cf2ad
-MD5 a424cd97af0177f56cd021c98a218e72 ChangeLog 2519
-RMD160 8aa7d338521d9d255c8519cc03ea5854ee713380 ChangeLog 2519
-SHA256 360f2baaa5237378f405ce77c30f6a8288c23996bc3001a1c642ee55c03cf2ad ChangeLog 2519
-MISC metadata.xml 760 RMD160 dfa704e003f15ca7c25eed77b26fa85044919ee5 SHA1 8726678ecd3442962f1d0f9ac1f7d4ad62afe62c SHA256 2c9999d1a2169f7bf8246b4a34763b877b929b14402e189535d5310552540b05
-MD5 c6e9a3453d84dc04fa4f064dafda061c metadata.xml 760
-RMD160 dfa704e003f15ca7c25eed77b26fa85044919ee5 metadata.xml 760
-SHA256 2c9999d1a2169f7bf8246b4a34763b877b929b14402e189535d5310552540b05 metadata.xml 760
-MD5 0320455631a52689687adad26163759b files/digest-ifc-10.0.026 813
-RMD160 62a067401adf9bc63c1318dc9e4ecaf5e4d4d691 files/digest-ifc-10.0.026 813
-SHA256 1e23703c25db370138b79eda20adaf2a0350901396e89e9adbea31a2527ea47c files/digest-ifc-10.0.026 813
+MISC ChangeLog 2752 RMD160 d802e3899f9eb9d0257870333826f86e4705efb6 SHA1 9fbc4dd66c6a83db1c3b14f3d97e9588d4306f7f SHA256 572797e6f983b31d4bc8a79bba92ddfdda563052d89793b4645d9a73e5919f12
+MD5 78cfae264c27d67134425ed73dd97d71 ChangeLog 2752
+RMD160 d802e3899f9eb9d0257870333826f86e4705efb6 ChangeLog 2752
+SHA256 572797e6f983b31d4bc8a79bba92ddfdda563052d89793b4645d9a73e5919f12 ChangeLog 2752
+MISC metadata.xml 745 RMD160 e241a21030bcce52d9e262724912deb3b3a26afe SHA1 33fbdc02ce19c3a867d736a8e1f9c0cc514f5735 SHA256 feb8d71ade91f586b46b2e1842d4a30493ee093597949752a52e8660bce98172
+MD5 303c1593da1ae3cdfc888108965ebc06 metadata.xml 745
+RMD160 e241a21030bcce52d9e262724912deb3b3a26afe metadata.xml 745
+SHA256 feb8d71ade91f586b46b2e1842d4a30493ee093597949752a52e8660bce98172 metadata.xml 745
+MD5 0320455631a52689687adad26163759b files/digest-ifc-10.0.026-r1 813
+RMD160 62a067401adf9bc63c1318dc9e4ecaf5e4d4d691 files/digest-ifc-10.0.026-r1 813
+SHA256 1e23703c25db370138b79eda20adaf2a0350901396e89e9adbea31a2527ea47c files/digest-ifc-10.0.026-r1 813
 MD5 f7b772df9792844ed3c06d418d0bf07c files/digest-ifc-9.1.040 253
 RMD160 e474c6270f5be42fc34ea626007262d061ac77fd files/digest-ifc-9.1.040 253
 SHA256 745b3f0cea5b6bab69ba65769e06be3096dc24b30ace24eec358de604dfcc223 files/digest-ifc-9.1.040 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHAU661ycZbhPLE2ARApTPAJ9OSaxTYrQwmfrxwfgNKKexdZ2msgCgr1R2
-AUTanMTzEZPAK5mdCnxSagU=
-=fi52
+iD8DBQFHAix91ycZbhPLE2ARAkFCAKChAvwJWUEYlaGMkzyTGokMqns5lwCgqiLO
+Zy0n6GHASUDZly4Enb//V0Y=
+=nqAB
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ifc/files/digest-ifc-10.0.026 b/dev-lang/ifc/files/digest-ifc-10.0.026-r1
index 5e6031c3abe8..5e6031c3abe8 100644
--- a/dev-lang/ifc/files/digest-ifc-10.0.026
+++ b/dev-lang/ifc/files/digest-ifc-10.0.026-r1
diff --git a/dev-lang/ifc/ifc-10.0.026.ebuild b/dev-lang/ifc/ifc-10.0.026-r1.ebuild
index 4701edc8b212..a4b7866861f0 100644
--- a/dev-lang/ifc/ifc-10.0.026.ebuild
+++ b/dev-lang/ifc/ifc-10.0.026-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-10.0.026.ebuild,v 1.1 2007/09/30 10:34:44 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-10.0.026-r1.ebuild,v 1.1 2007/10/02 11:33:05 bicatali Exp $
 
-inherit rpm elisp-common
+inherit rpm
 
 PID=787
 PB=fc
@@ -24,39 +24,20 @@ LICENSE="Intel-SDP"
 SLOT="0"
 
 RESTRICT="test strip mirror"
-IUSE="emacs debugger"
-
+IUSE=""
 DEPEND=""
-RDEPEND="debugger? (
-	x11-libs/libXt
-	x11-libs/libXft
-	dev-libs/libxml2
-	virtual/libstdc++ )"
-
-if use x86; then
-	MY_P="${PACKAGEID}_ia32"
-elif use amd64; then
-	MY_P="${PACKAGEID}_intel64"
-elif use ia64; then
-	MY_P="${PACKAGEID}_ia64"
-fi
-
-S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
+	mv "${WORKDIR}"/l_* "${S}"
 	cd "${S}"
 
 	local ext=
 	use amd64 && ext=e
 	INSTALL_DIR=/opt/intel/${PB}${ext}/${PV}
 
-	if use debugger && [[ ! -x /opt/intel/idb${ext}/${PV}/bin/idb ]]; then
-		INSTALL_IDB_DIR=/opt/intel/idb${ext}/${PV}
-	else
-		use debugger && einfo "Debugger already installed"
-		rm -f data/intel*idb*.rpm
-	fi
+	# debugger installed with dev-lang/idb
+	rm -f data/intel*idb*.rpm
 
 	for x in data/intel*.rpm; do
 		einfo "Extracting $(basename ${x})..."
@@ -91,36 +72,19 @@ src_install() {
 	echo "LDPATH=${INSTALL_DIR}/lib" >> ${env_file}
 	echo "MANPATH=${INSTALL_DIR}/man" >> ${env_file}
 	echo "INCLUDE=${INSTALL_DIR}/include" >> ${env_file}
-	echo "IA32ROOT=${INSTALL_DIR}" >> ${env_file}
 	doenvd ${env_file} || die "doenvd ${env_file} failed"
-
-	if [[ -n ${INSTALL_IDB_DIR} ]]; then
-		dodir ${INSTALL_IDB_DIR}
-		cp -pPR \
-			"${S}"/${INSTALL_IDB_DIR}/* \
-			"${D}"/${INSTALL_IDB_DIR}/ \
-			|| die "copying debugger failed"
-		local idb_env_file=06idb
-		echo "PATH=${INSTALL_IDB_DIR}/bin" > ${idb_env_file}
-		echo "ROOTPATH=${INSTALL_IDB_DIR}/bin" >> ${idb_env_file}
-		echo "MANPATH=${INSTALL_IDB_DIR}/man" >> ${idb_env_file}
-		doenvd ${idb_env_file} || die "doenvd ${idb_env_file} failed"
-		use emacs && \
-			elisp-site-file-install "${S}"${INSTALL_IDB_DIR}/bin/*.el
-	fi
 }
 
 pkg_postinst () {
-	elog "Make sure you have recieved the restrictive"
-	elog "non-commercial license ${PN} by registering at:"
+	# remove left over from unpacking
+	rm -f "${ROOT}"/opt/intel/{intel_sdp_products.db,.*.log} || die "remove logs failed"
+
+	elog "Make sure you have recieved the a license for ${PN}"
+	elog "To receive a restrictive non-commercial licenses , you need to register at:"
 	elog "http://www.intel.com/cd/software/products/asmo-na/eng/download/download/219771.htm"
-	elog "You cannot run ${PN} without this license file."
 	elog "Read the website for more information on this license."
-	elog "To use ${PN} now, issue first \n\tsource /etc/profile"
-	use emacs && elisp-site-regen
-	rm -f "${ROOT}"/opt/intel/{intel_sdp_products.db,.*.log}
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
+	elog "You cannot run ${PN} without a license file."
+	elog "Then put the license file into ${ROOT}/opt/intel/licenses"
+	elog "\nTo use ${PN} issue first \n\tsource /etc/profile"
+	elog "Debugger is installed with dev-lang/idb"
 }
diff --git a/dev-lang/ifc/metadata.xml b/dev-lang/ifc/metadata.xml
index 7a5df05b4d4a..009dd228c20a 100644
--- a/dev-lang/ifc/metadata.xml
+++ b/dev-lang/ifc/metadata.xml
@@ -7,13 +7,12 @@
 <name>Danny van Dyk</name>
 </maintainer>
 <longdescription lang="en">
-The Intel® Fortran Compiler is a full features FORTRAN 77/95 and
-substantial FORTRAN 2003 compiler for Intel based architectures.
-It is here offered as a non-commercial (please see web site to see
-terms of qualifications). 
-The compiler supports multi-threading, and processor support that includes automatic
-processor dispatch, vectorization, auto-parallelization, OpenMP, data
-prefetching, loop unrolling. The package come with a debugger and
-large documentation.
+The Intel® Fortran Compiler is a full featured FORTRAN 77/95 and
+substantial FORTRAN 2003 compiler for Intel based architectures. The
+compiler supports multi-threading with automatic processor dispatch,
+vectorization, auto-parallelization, OpenMP, data prefetching, loop
+unrolling. The package comes with extensive documentation.
+The product can be installed as a non-commercial as well. License,
+terms of qualifications can be found on the web site.
 </longdescription>
 </pkgmetadata>