--- bitkeeper-3.0.1-r1.ebuild	2003-05-24 16:11:50.000000000 -0400
+++ bitkeeper-3.0.1-r2.ebuild	2003-05-24 17:06:56.000000000 -0400
@@ -4,16 +4,16 @@
 
 DESCRIPTION="A scalable configuration management system."
 HOMEPAGE="http://www.bitkeeper.com/"
-SRC_URI="x86? ( bk-3.0.1-x86-glibc22-linux.bin )
-	ppc? ( bk-3.0.1-powerpc-glibc21-linux.bin )
-	sparc? ( bk-3.0.1-sparc-glibc21-linux.bin )
-	alpha? ( bk-3.0.1-alpha-glibc21-linux.bin )
-	arm? ( bk-3.0.1-arm-glibc21-linux.bin )
-	hppa? ( bk-3.0.1-hppa-glibc22-linux.bin )"
+SRC_URI="x86? ( bk-${PV}-x86-glibc22-linux.bin )
+	ppc? ( bk-${PV}-powerpc-glibc21-linux.bin )
+	sparc? ( bk-${PV}-sparc-glibc21-linux.bin )
+	alpha? ( bk-${PV}-alpha-glibc21-linux.bin )
+	arm? ( bk-${PV}-arm-glibc21-linux.bin )
+	hppa? ( bk-${PV}-hppa-glibc22-linux.bin )"
 
 SLOT="0"
 LICENSE="BKL"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~arm ~hppa"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa"
 IUSE="X"
 
 # binary package, so no DEPENDs; X optional in RDEPENDs
@@ -57,7 +57,7 @@
 }
 
 src_install() {
-	dodir /opt /etc/env.d /usr/share/man/man1
+	dodir /opt /usr/share/man/man1 /usr/bin
 
 	mv ${S} ${D}/opt/${P} && cd ${D}
 
@@ -81,13 +81,23 @@
 
 	dosym /opt/${P}/man/man1/bk.1.gz /usr/share/man/man1/bk.1.gz
 
-	cat <<-EOF >${D}/etc/env.d/10bitkeeper
-		# Generated by ${PF} ebuild
-		PATH=/opt/${P}
-		ROOTPATH=/opt/${P}
-		EOF
+	# mimic "bk links /opt/${P} /usr/bin"
+	dosym /opt/${P}/admin /usr/bin/admin
+	dosym /opt/${P}/bk /usr/bin/bk
+	dosym /opt/${P}/delta /usr/bin/delta
+	dosym /opt/${P}/get /usr/bin/get
+	dosym /opt/${P}/prs /usr/bin/prs
+	dosym /opt/${P}/rmdel /usr/bin/rmdel
+	dosym /opt/${P}/unget /usr/bin/unget
 }
 
 pkg_postinst() {
+	if grep -H bitkeeper /etc/man.conf; then
+		eerror "Previous BitKeeper ebuilds induced a misconfiguration when sys-apps/man was"
+		eerror "next upgraded. You appear to have fallen victim--edit /etc/man.conf and look"
+		eerror "for the definition of CMP. It should refer to /usr/bin/cmp, not the"
+		eerror "BitKeeper cmp."
+		eerror "For more information, see bugs #18247 and #21638."
+	fi
 	einfo "Run 'bk regression' to verify the installation. (Recommended)"
 }