From: Stefan Schweizer <genstef@gentoo.org>
Date: Sat, 16 Sep 2006 13:55:17 +0000 (+0000)
Subject: sys-fs/cryptmount: CONFIG_CHECK and emake install
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=e1627e9de0a33a00fe4047fb7f3418ae07731cc9;p=~andy%2Fsunrise

sys-fs/cryptmount: CONFIG_CHECK and emake install

svn path=/sunrise/; revision=1260
---

diff --git a/sys-fs/cryptmount/ChangeLog b/sys-fs/cryptmount/ChangeLog
index 0eb48f7b1..c6fa0c86e 100644
--- a/sys-fs/cryptmount/ChangeLog
+++ b/sys-fs/cryptmount/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Sep 2006; Stefan Schweizer <genstef@gentoo.org> cryptmount-1.1.ebuild:
+  CONFIG_CHECK and emake install
+
   14 Sep 2006; Thomas Patrick (curmudgeon) <throw_away_2002@yahoo.com>
   +cryptmount-1.1.ebuild, +metadata.xml:
   New ebuild (my first :) ) #147491
diff --git a/sys-fs/cryptmount/Manifest b/sys-fs/cryptmount/Manifest
index 7b094fda1..c976d379d 100644
--- a/sys-fs/cryptmount/Manifest
+++ b/sys-fs/cryptmount/Manifest
@@ -1,12 +1,12 @@
 DIST cryptmount-1.1.tar.gz 201989 RMD160 80e47bb2ebf95fc56bf2505c4e57385406c979ea SHA1 bb0dde6a80ec7e098c19ecdbf8391ade5a17c618 SHA256 80f79ef2f4042708e867716079357adb505244a93cab4ccb1809c8a9d291044c
-EBUILD cryptmount-1.1.ebuild 1513 RMD160 b6804f2c70ebc8c358b94dbfce579987a77efb16 SHA1 ac1675889a7e89ec1abc939abd4be5097b24e4a2 SHA256 f5db806476a3bf67c55ed62992db11bde540c7fc24ff8a0099b5f1b502ce85d7
-MD5 a215ebac23c97e95dd01adefb0c6da7a cryptmount-1.1.ebuild 1513
-RMD160 b6804f2c70ebc8c358b94dbfce579987a77efb16 cryptmount-1.1.ebuild 1513
-SHA256 f5db806476a3bf67c55ed62992db11bde540c7fc24ff8a0099b5f1b502ce85d7 cryptmount-1.1.ebuild 1513
-MISC ChangeLog 267 RMD160 1937090d9e061f7e2bfb05ad59f7df31afced591 SHA1 23bfbcf22625efe0c30bd3789eafb7d332376c1a SHA256 c248f0c067f8c22294e9e1954267d1412b02f706316caf950656dec5e74eab21
-MD5 ccc38cc5275dbf5e7c35023b24ddcc17 ChangeLog 267
-RMD160 1937090d9e061f7e2bfb05ad59f7df31afced591 ChangeLog 267
-SHA256 c248f0c067f8c22294e9e1954267d1412b02f706316caf950656dec5e74eab21 ChangeLog 267
+EBUILD cryptmount-1.1.ebuild 1182 RMD160 6e91dee467848c5f01d04b469060807c0fa20614 SHA1 e2ed9dd7e434de8f7f40bcf34e769b0bf14d230c SHA256 b5037960c10cea870d612ab3f8ea94fd02fc583f7db7093a8e5f70955b1ac2bb
+MD5 2e62dfee826e758ec570d333cc010558 cryptmount-1.1.ebuild 1182
+RMD160 6e91dee467848c5f01d04b469060807c0fa20614 cryptmount-1.1.ebuild 1182
+SHA256 b5037960c10cea870d612ab3f8ea94fd02fc583f7db7093a8e5f70955b1ac2bb cryptmount-1.1.ebuild 1182
+MISC ChangeLog 377 RMD160 3c8bc05facef52ca5a107f4ff30532e9a5e7e1a5 SHA1 e85acd37290d939b11d925cdc661ce5e5eb48439 SHA256 4ec0c749f6ca7790dff4a1c94231a5c82b260c8b3b494f180405f3c96940db21
+MD5 b7e10c670d9e96e7331dd49692b1c5b5 ChangeLog 377
+RMD160 3c8bc05facef52ca5a107f4ff30532e9a5e7e1a5 ChangeLog 377
+SHA256 4ec0c749f6ca7790dff4a1c94231a5c82b260c8b3b494f180405f3c96940db21 ChangeLog 377
 MISC metadata.xml 479 RMD160 5e4dc631b5ef9d0599ceab035ee0144ca2b70eda SHA1 e4814157fff93c8d95b4aedaf5a651276f0a799f SHA256 de5b4b7c2a0ae4e0a7b9474ac0bbdf97ba73da2175b2cce8cf6cb914d004fb15
 MD5 bc03e211a0a3b68398ab438f00bd7688 metadata.xml 479
 RMD160 5e4dc631b5ef9d0599ceab035ee0144ca2b70eda metadata.xml 479
diff --git a/sys-fs/cryptmount/cryptmount-1.1.ebuild b/sys-fs/cryptmount/cryptmount-1.1.ebuild
index 8e1f5dd6d..e4f9cef97 100644
--- a/sys-fs/cryptmount/cryptmount-1.1.ebuild
+++ b/sys-fs/cryptmount/cryptmount-1.1.ebuild
@@ -18,30 +18,12 @@ DEPEND="sys-fs/device-mapper
 	ssl? ( dev-libs/openssl )
 	nls? ( sys-devel/gettext )"
 RDEPEND="${DEPEND}"
-
-dm-crypt_check() {
-	ebegin "Checking for Device mapper support (BLK_DEV_DM)"
-	linux_chkconfig_present BLK_DEV_DM
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		ewarn "Cryptmount requires Device mapper support!"
-		ewarn "Please enable Device mapper support in your kernel config, found at:"
-		ewarn "(for 2.6 kernels)"
-		ewarn
-		ewarn "  Device Drivers"
-		ewarn "    Multi-Device Support"
-		ewarn "      <*> Device mapper support"
-		ewarn
-		ewarn "and recompile your kernel if you want this package to work."
-		epause 10
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	dm-crypt_check
-}
+CONFIG_CHECK="BLK_DEV_DM"
+ERROR_BLK_DEV_DM="Please enable Device mapper support in your kernel config
+	-> Device Drivers
+	  -> Multi-device support (RAID and LVM)
+	    -> Multiple devices driver support (RAID and LVM) (MD)
+		  <M> Device mapper support"
 
 src_compile() {
 	# recommended for setXid, dynamically linked biraries
@@ -52,12 +34,12 @@ src_compile() {
 		--with-libgcrypt \
 		$(use_enable nls) \
 		$(use_with ssl openssl) \
-	|| die "Configuration failed"
+	|| die "econf failed"
 
-	emake || die "Compilation failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "Installation failed"
+	emake install DESTDIR="${D}" || die "emake install failed"
 	dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README RELNOTES ToDo
 }