dev-cpp/omnetpp: Pinpoint tk dependency; use ${PF} for docs

svn path=/sunrise/; revision=2528

3 files changed, 22 insertions, 21 deletions

diff --git a/dev-cpp/omnetpp/ChangeLog b/dev-cpp/omnetpp/ChangeLog
index b1f3e3caf..16ba2e6b9 100644
--- a/dev-cpp/omnetpp/ChangeLog
+++ b/dev-cpp/omnetpp/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Dec 2006; Jakub Moc <jakub@gentoo.org> omnetpp-3.3.ebuild:
+  Pinpoint tk dependency; use ${PF} for docs
+
   28 Dec 2006; Jakob Dettner (jdettner) <gentoo@dettner.de>
   +omnetpp-3.3.ebuild, +metadata.xml:
   New Ebuild for bug 159300 thanks to Charlie Shepherd and #gentoo-sunrise
diff --git a/dev-cpp/omnetpp/Manifest b/dev-cpp/omnetpp/Manifest
index 5505ab71e..8d9c613f1 100644
--- a/dev-cpp/omnetpp/Manifest
+++ b/dev-cpp/omnetpp/Manifest
@@ -1,12 +1,12 @@
 DIST omnetpp-3.3-src.tgz 6942933 RMD160 1da4bd75e54804859a3f0938c5e0c95ef3ed6eda SHA1 f2811a63a201028b3c79c0bdf97c3ba5305c067f SHA256 f30fef40428a4177cc0ee3fb8a50d64101e6ddd5eaa464ec69f83a634b8c22f3
-EBUILD omnetpp-3.3.ebuild 1425 RMD160 ebe23841d63c655475d80cb8e25d2436b2892bb8 SHA1 23c29a874f5b09c08122d6c564990a944968a9fe SHA256 77af5e013b700986d263ac18391d0c519df56ae72c967843480a144a278e4c51
-MD5 a20b83f7bac744b0a6f0de9dc95da529 omnetpp-3.3.ebuild 1425
-RMD160 ebe23841d63c655475d80cb8e25d2436b2892bb8 omnetpp-3.3.ebuild 1425
-SHA256 77af5e013b700986d263ac18391d0c519df56ae72c967843480a144a278e4c51 omnetpp-3.3.ebuild 1425
-MISC ChangeLog 290 RMD160 01e4ea5f844cadbe06c0c963e5b212fa5016dde5 SHA1 ad697462259584bd13b514d115886c2e02e17bd9 SHA256 96b4c70001f9277333c10733082432f8746b11898a65581fb2178dc02c6fc696
-MD5 d1282f615505e5971a62c31cd1f77ac6 ChangeLog 290
-RMD160 01e4ea5f844cadbe06c0c963e5b212fa5016dde5 ChangeLog 290
-SHA256 96b4c70001f9277333c10733082432f8746b11898a65581fb2178dc02c6fc696 ChangeLog 290
+EBUILD omnetpp-3.3.ebuild 1396 RMD160 3f7771157d8c864e48cedb3da7368235e7a7e83b SHA1 d7f3d963ce25f0b28e1989a0b4d84de38ba49bbf SHA256 54598b48aaaef377d0a33c3563065de1fcbe370d18a9ae1d1fa8d5650dff1223
+MD5 a6c85fc8b7943b8452f4e17f412cf48a omnetpp-3.3.ebuild 1396
+RMD160 3f7771157d8c864e48cedb3da7368235e7a7e83b omnetpp-3.3.ebuild 1396
+SHA256 54598b48aaaef377d0a33c3563065de1fcbe370d18a9ae1d1fa8d5650dff1223 omnetpp-3.3.ebuild 1396
+MISC ChangeLog 400 RMD160 518f5df52f609772e2941bce5f47922736a03e46 SHA1 527f5dc1951032e92179adfda8d48edb70f062aa SHA256 5781db13e7d8dd75ed4adc0727a4eb11328c7762fba2e915929653cd81514c45
+MD5 75af9d72fb354fc016ca4974b6b3fff1 ChangeLog 400
+RMD160 518f5df52f609772e2941bce5f47922736a03e46 ChangeLog 400
+SHA256 5781db13e7d8dd75ed4adc0727a4eb11328c7762fba2e915929653cd81514c45 ChangeLog 400
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
diff --git a/dev-cpp/omnetpp/omnetpp-3.3.ebuild b/dev-cpp/omnetpp/omnetpp-3.3.ebuild
index f04ab91f3..396580d13 100644
--- a/dev-cpp/omnetpp/omnetpp-3.3.ebuild
+++ b/dev-cpp/omnetpp/omnetpp-3.3.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~x86"
 IUSE="examples"
 
 DEPEND="=dev-lang/tcl-8.4*
-	dev-lang/tk
+	=dev-lang/tk-8.4*
 	app-doc/doxygen
 	sys-devel/bison
 	dev-lang/perl
@@ -27,7 +27,7 @@ src_compile() {
 	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${S}/lib"
 	export TCL_LIBRARY="$ROOT/usr/lib/tcl8.4"
 	econf || die 'econf failed'
-	emake || die 'error: emake failed'
+	emake || die 'emake failed'
 }
 
 src_install() {
@@ -35,13 +35,13 @@ src_install() {
 	dolib lib/*
 	dobin bin/*
 	dodoc doc/*
-	insinto "/usr/share/doc/${P}/bitmaps"
-	doins -r bitmaps/* || die "error: installing data failed"
+	insinto "/usr/share/doc/${PF}/bitmaps"
+	doins -r bitmaps/* || die "installing bitmaps failed"
 	if use examples ; then
-		insinto "/usr/share/doc/${P}/samples"
-		doins -r samples/* || die "error: installing data failed"
+		insinto "/usr/share/doc/${PF}/samples"
+		doins -r samples/* || die "installing samples failed"
 		for x in $(find ./samples -executable -type f); do
-			exeinto "/usr/share/doc/${P}/$(dirname ${x})"
+			exeinto "/usr/share/doc/${PF}/$(dirname ${x})"
 			doexe "${x}"
 		done;
 	fi
@@ -49,11 +49,9 @@ src_install() {
 
 pkg_postinst() {
 	if use examples ; then
-		echo ""
-		einfo "In order to provide the samples"
-		einfo "please copy them to a user home directory."
-		einfo "The samples are located in:"
-		einfo "   /usr/share/doc/${P}/samples"
-		echo ""
+		elog "In order to provide the samples"
+		elog "please copy them to a user home directory."
+		elog "The samples are located in:"
+		elog "   /usr/share/doc/${PF}/samples"
 	fi
 }