Cleanup

(Portage version: 2.1.2-r4)

8 files changed, 10 insertions, 362 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index b7cbd70d3cad..0ec04725846f 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/truecrypt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.10 2007/01/24 17:17:52 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.11 2007/01/27 22:08:16 alonbl Exp $
+
+  27 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/truecrypt-4.2-makefile.patch,
+  -files/truecrypt-4.2-nosectorformat.patch, -truecrypt-4.2-r1.ebuild,
+  -truecrypt-4.2a.ebuild:
+  Cleanup
 
   24 Jan 2007; Marius Mauch <genone@gentoo.org> truecrypt-4.2-r1.ebuild,
   truecrypt-4.2a.ebuild, truecrypt-4.2a-r1.ebuild:
diff --git a/app-crypt/truecrypt/files/digest-truecrypt-4.2-r1 b/app-crypt/truecrypt/files/digest-truecrypt-4.2-r1
deleted file mode 100644
index 9951f54d3da9..000000000000
--- a/app-crypt/truecrypt/files/digest-truecrypt-4.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8ea4464f3f89fe8c367dc19982a8f611 truecrypt-4.2-source-code.tar.gz 1076093
-RMD160 74ba185bad9952ea9b3b0e358e9fee6f2080e6b9 truecrypt-4.2-source-code.tar.gz 1076093
-SHA256 54f54cd68c99efe3fd2c0899174b38d4cfe1ad576112672aabd2ac64e336cd1f truecrypt-4.2-source-code.tar.gz 1076093
diff --git a/app-crypt/truecrypt/files/digest-truecrypt-4.2a b/app-crypt/truecrypt/files/digest-truecrypt-4.2a
deleted file mode 100644
index 6aac1268b685..000000000000
--- a/app-crypt/truecrypt/files/digest-truecrypt-4.2a
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6e60ead403fe23355f61341ccce68ff1 truecrypt-4.2a-source-code.tar.gz 1088418
-RMD160 8d5b142f9cc7de5693b527f8d708d9e1ebd1e2b3 truecrypt-4.2a-source-code.tar.gz 1088418
-SHA256 ba1892584bf52b5a12eef185563705774566a70537d139aef8770477dfe9636f truecrypt-4.2a-source-code.tar.gz 1088418
diff --git a/app-crypt/truecrypt/files/truecrypt-4.2-makefile.patch b/app-crypt/truecrypt/files/truecrypt-4.2-makefile.patch
deleted file mode 100644
index 8b4017f6bc09..000000000000
--- a/app-crypt/truecrypt/files/truecrypt-4.2-makefile.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- Linux/Cli/Makefile.orig	2006-03-26 06:29:38.000000000 +1100
-+++ Linux/Cli/Makefile	2006-06-05 17:57:29.000000000 +1000
-@@ -3,27 +3,16 @@
- TC_COMMON := ../../Common
- TC_CRYPTO := ../../Crypto
- 
--CC := gcc
-+CC ?= gcc
- 
- ifneq ($(MAKECMDGOALS),clean)
- -include ../Common/.platform
- endif
- 
--ifdef NO_WARNINGS
--CFLAGS := -w
--else
--CFLAGS := -W
--endif
- CFLAGS += -I../../Crypto -I../../Common -I../Kernel
- CFLAGS += -D_cdecl="" -DBOOL=int -DTRUE=1 -DFALSE=0 -DMAX_PATH=260
- CFLAGS += $(TYPES)
- 
--ifndef DEBUG
--CFLAGS += -O2 -fno-strict-aliasing
--else
--CFLAGS += -ggdb
--endif
--
- KERNEL_OBJS_F := ../.kernel-objs
- USER_OBJS_F := ../.user-objs
- 
-@@ -61,18 +50,18 @@
- 	@echo Compiling $(<F)
- 	@$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -MMD -o $@ -c $<
- 
--all: objclean truecrypt
-+all: $(USER_OBJS_F) truecrypt
- 	@echo Done.
- 
- ../Common/.platform: ../Common/Platform.c
--	@$(CC) -o ../Common/platform $<
-+	$(CC) -o ../Common/platform $<
- 	@../Common/platform >../Common/.platform
- 
- -include $(OBJS:.o=.d)
- 
- truecrypt: $(OBJS)
- 	@echo Linking $@
--	@$(CC) -o $@ $(OBJS)
-+	$(CC) -o $@ $(OBJS)
- ifndef DEBUG
- 	@strip $@
- endif
-@@ -82,9 +71,11 @@
- truecrypt.1: objclean truecrypt
- 	help2man -N -i Man/help2man.inc ./truecrypt >Man/truecrypt.1
- 	
--objclean:
--	@if [ -f $(KERNEL_OBJS_F) ]; then rm -f ${OBJS} $(KERNEL_OBJS_F); fi
-+$(USER_OBJS_F):
-+	@[ -f $(KERNEL_OBJS_F) ] && rm -f ${OBJS} $(KERNEL_OBJS_F)
- 	@>$(USER_OBJS_F)
- 
- clean:
- 	-rm -f truecrypt ${OBJS} *.d $(TC_COMMON)/*.d $(TC_CRYPTO)/*.d ../Common/platform ../Common/.platform
-+
-+.PHONY: man clean
diff --git a/app-crypt/truecrypt/files/truecrypt-4.2-nosectorformat.patch b/app-crypt/truecrypt/files/truecrypt-4.2-nosectorformat.patch
deleted file mode 100644
index 4c5bc7c82c21..000000000000
--- a/app-crypt/truecrypt/files/truecrypt-4.2-nosectorformat.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- ./Linux/Kernel/Dm-target.c.orig	2006-06-06 21:31:51.000000000 +1000
-+++ ./Linux/Kernel/Dm-target.c	2006-06-06 21:45:08.000000000 +1000
-@@ -161,7 +161,7 @@
- 		goto err;
- 	}
- 
--	if (sscanf (argv[ARG_SEC], SECTOR_FORMAT, &tc->start) != 1)
-+	if (sscanf (argv[ARG_SEC], "%Lu", &tc->start) != 1)
- 	{
- 		ti->error = "truecrypt: Invalid device sector";
- 		goto err;
-@@ -224,14 +224,14 @@
- 	}
- 
- 	// Read-only start sector
--	if (sscanf (argv[ARG_RO_START], SECTOR_FORMAT, &tc->read_only_start) != 1)
-+	if (sscanf (argv[ARG_RO_START], "%Lu", &tc->read_only_start) != 1)
- 	{
- 		ti->error = "truecrypt: Invalid read-only start sector";
- 		goto err;
- 	}
- 
- 	// Read-only end sector
--	if (sscanf (argv[ARG_RO_END], SECTOR_FORMAT, &tc->read_only_end) != 1)
-+	if (sscanf (argv[ARG_RO_END], "%Lu", &tc->read_only_end) != 1)
- 	{
- 		ti->error = "truecrypt: Invalid read-only end sector";
- 		goto err;
-@@ -375,8 +375,8 @@
- 	int seg_no;
- 	
- 	trace (3, "truecrypt_endio (%p, %d, %d)\n", bio, bytes_done, error);
--	trace (1, "end: sc=" SECTOR_FORMAT " fl=%ld rw=%ld sz=%d ix=%hd vc=%hd dn=%d er=%d\n",
--		bio->bi_sector, bio->bi_flags, bio->bi_rw, bio->bi_size, bio->bi_idx, bio->bi_vcnt, bytes_done, error);
-+	trace (1, "end: sc=%llu fl=%ld rw=%ld sz=%d ix=%hd vc=%hd dn=%d er=%d\n",
-+		(unsigned long long) bio->bi_sector, bio->bi_flags, bio->bi_rw, bio->bi_size, bio->bi_idx, bio->bi_vcnt, bytes_done, error);
- 
- 	if (error != 0)
- 		bc->error = error;
-@@ -420,8 +420,8 @@
- 	int seg_no;
- 
- 	trace (3, "truecrypt_map (%p, %p, %p)\n", ti, bio, map_context);
--	trace (1, "map: sc=" SECTOR_FORMAT " fl=%ld rw=%ld sz=%d ix=%hd vc=%hd\n",
--		bio->bi_sector, bio->bi_flags, bio->bi_rw, bio->bi_size, bio->bi_idx, bio->bi_vcnt);
-+	trace (1, "map: sc=%llu fl=%ld rw=%ld sz=%d ix=%hd vc=%hd\n",
-+		(unsigned long long) bio->bi_sector, bio->bi_flags, bio->bi_rw, bio->bi_size, bio->bi_idx, bio->bi_vcnt);
- 
- 	// Write protection
- 	if (bio_data_dir (bio) == WRITE && READ_ONLY (tc))
-@@ -547,7 +547,7 @@
- 
- 	atomic_inc (&bc->ref_count);
- 
--	trace (3, "generic_make_request (rw=%ld sc=" SECTOR_FORMAT ")\n", bion->bi_rw, bion->bi_sector);
-+	trace (3, "generic_make_request (rw=%ld sc=%llu )\n", bion->bi_rw,(unsigned long long) bion->bi_sector);
- 	generic_make_request (bion);
- 
- 	dereference_bio_ctx (bc);
-@@ -569,13 +569,13 @@
- 		{
- 			char name[32];
- 			format_dev_t (name, tc->dev->bdev->bd_dev);
--			snprintf (result, maxlen, "%d %d 0 0 %s " SECTOR_FORMAT " " SECTOR_FORMAT " " SECTOR_FORMAT " %Ld %Ld %d %s",
-+			snprintf (result, maxlen, "%d %d 0 0 %s %llu %llu %llu %Ld %Ld %d %s",
- 				tc->ci->ea,
- 				tc->ci->mode,
- 				name,
--				tc->start,
--				tc->read_only_start,
--				tc->read_only_end,
-+				(unsigned long long) tc->start,
-+				(unsigned long long) tc->read_only_start,
-+				(unsigned long long) tc->read_only_end,
- 				tc->mtime,
- 				tc->atime,
- 				tc->flags,
diff --git a/app-crypt/truecrypt/truecrypt-4.2-r1.ebuild b/app-crypt/truecrypt/truecrypt-4.2-r1.ebuild
deleted file mode 100644
index 8b90c4a9a268..000000000000
--- a/app-crypt/truecrypt/truecrypt-4.2-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-4.2-r1.ebuild,v 1.2 2007/01/24 17:17:52 genone Exp $
-
-inherit linux-mod toolchain-funcs
-
-DESCRIPTION="Free open-source disk encryption software for Windows XP/2000/2003 and Linux"
-HOMEPAGE="http://www.truecrypt.org/"
-SRC_URI="http://www.truecrypt.org/downloads/truecrypt-${PV}-source-code.tar.gz"
-
-LICENSE="truecrypt-2.0"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="virtual/linux-sources
-	sys-fs/device-mapper"
-
-RDEPEND="sys-fs/device-mapper"
-
-BUILD_PARAMS="KSRC=${KV_DIR} NO_WARNINGS=1"
-BUILD_TARGETS="truecrypt"
-MODULE_NAMES="truecrypt(block:${S}/Linux/Kernel)"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	dmcrypt_check
-	kernel_is lt 2 6 5 && die 'requires at least 2.6.5 kernel version'
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	linux-mod_pkg_setup
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	epatch "${FILESDIR}/${P}-nosectorformat.patch"
-}
-
-src_compile() {
-	linux-mod_src_compile || die "Truecrypt module compilation failed."
-	cd "${S}/Linux/Cli"
-	einfo "Building truecrypt utility"
-	tc-export CC
-	# remove kernel linked crypt stuff
-	emake clean || die "make clean failed"
-	emake truecrypt || die "Compile and/or linking of TrueCrypt Linux CLI application failed."
-}
-
-src_test() {
-	"${S}/Linux/Cli/truecrypt" --test
-}
-
-pkg_preinst() {
-	# unload truecrypt modules if already loaded
-	/sbin/rmmod truecrypt >&- 2>&-
-	if grep -q "^truecrypt" /proc/modules
-	then
-		die "Please dismount all mounted TrueCrypt volumes"
-	fi
-}
-
-src_install() {
-	# installing files
-	dobin Linux/Cli/truecrypt
-	doman Linux/Cli/Man/truecrypt.1
-	dodoc Readme.txt 'Release/Setup Files/TrueCrypt User Guide.pdf'
-
-	# installing kernel module
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog " For TrueCrypt 4.2 to work you have to load a "
-	elog " kernel module. This can be done in three ways: "
-	elog
-	elog " 1. Loading the module automatically by the running kernel. "
-	elog "    For this 'Automatic kernel module loading' needs to be "
-	elog "    enabled (CONFIG_KMOD=y). "
-	elog " 2. Loading the module manually before mounting the volume. "
-	elog "    Try 'modprobe truecrypt' as root to load the module. "
-	elog " 3. Load the module during boot by listing it in "
-	elog "    '/etc/modules.autoload.d/kernel-2.6' "
-}
-
-dmcrypt_check() {
-	ebegin "Checking for Device mapper support (BLK_DEV_DM)"
-	linux_chkconfig_present BLK_DEV_DM
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		ewarn "TrueCrypt 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
-}
-
diff --git a/app-crypt/truecrypt/truecrypt-4.2a-r1.ebuild b/app-crypt/truecrypt/truecrypt-4.2a-r1.ebuild
index c4f69ab2e3e0..02c1cac127ab 100644
--- a/app-crypt/truecrypt/truecrypt-4.2a-r1.ebuild
+++ b/app-crypt/truecrypt/truecrypt-4.2a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-4.2a-r1.ebuild,v 1.2 2007/01/24 17:17:52 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-4.2a-r1.ebuild,v 1.3 2007/01/27 22:08:16 alonbl Exp $
 
 inherit linux-mod toolchain-funcs
 
@@ -31,8 +31,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}"_kernel-2.6.18-rc1_fix.patch
-	epatch "${FILESDIR}/${P}"-2.6.19.patch
+	epatch "${FILESDIR}/${P}_kernel-2.6.18-rc1_fix.patch"
+	epatch "${FILESDIR}/${P}-2.6.19.patch"
 	epatch "${FILESDIR}/${P}-makefile.patch"
 	linux-mod_pkg_setup
 }
diff --git a/app-crypt/truecrypt/truecrypt-4.2a.ebuild b/app-crypt/truecrypt/truecrypt-4.2a.ebuild
deleted file mode 100644
index 1937dc899e96..000000000000
--- a/app-crypt/truecrypt/truecrypt-4.2a.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-4.2a.ebuild,v 1.6 2007/01/24 17:17:52 genone Exp $
-
-inherit linux-mod toolchain-funcs
-
-DESCRIPTION="Free open-source disk encryption software"
-HOMEPAGE="http://www.truecrypt.org/"
-SRC_URI="http://www.truecrypt.org/downloads/truecrypt-${PV}-source-code.tar.gz"
-
-LICENSE="truecrypt-collective-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/linux-sources
-	sys-fs/device-mapper"
-
-RDEPEND="sys-fs/device-mapper"
-
-BUILD_PARAMS="KERNEL_SRC=${KERNEL_DIR} NO_WARNINGS=1"
-BUILD_TARGETS="truecrypt"
-MODULE_NAMES="truecrypt(block:${S}/Linux/Kernel)"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	dmcrypt_check
-	kernel_is lt 2 6 5 && die 'requires at least 2.6.5 kernel version'
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}"_kernel-2.6.18-rc1_fix.patch
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	linux-mod_pkg_setup
-}
-
-src_compile() {
-	linux-mod_src_compile || die "Truecrypt module compilation failed."
-	cd "${S}/Linux/Cli"
-	einfo "Building truecrypt utility"
-	tc-export CC
-	# remove kernel linked crypt stuff
-	emake clean || die "make clean failed"
-	emake truecrypt NO_STRIP=1 || die "Compile and/or linking of TrueCrypt Linux CLI application failed."
-}
-
-src_test() {
-	"${S}/Linux/Cli/truecrypt" --test
-}
-
-pkg_preinst() {
-	# unload truecrypt modules if already loaded
-	/sbin/rmmod truecrypt >&- 2>&-
-	if grep -q "^truecrypt" /proc/modules
-	then
-		die "Please dismount all mounted TrueCrypt volumes"
-	fi
-}
-
-src_install() {
-	# installing files
-	dobin Linux/Cli/truecrypt
-	doman Linux/Cli/Man/truecrypt.1
-	dodoc Readme.txt 'Release/Setup Files/TrueCrypt User Guide.pdf'
-
-	# installing kernel module
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog " For TrueCrypt 4.2 to work you have to load a "
-	elog " kernel module. This can be done in three ways: "
-	elog
-	elog " 1. Loading the module automatically by the running kernel. "
-	elog "    For this 'Automatic kernel module loading' needs to be "
-	elog "    enabled (CONFIG_KMOD=y). "
-	elog " 2. Loading the module manually before mounting the volume. "
-	elog "    Try 'modprobe truecrypt' as root to load the module. "
-	elog " 3. Load the module during boot by listing it in "
-	elog "    '/etc/modules.autoload.d/kernel-2.6' "
-}
-
-dmcrypt_check() {
-	ebegin "Checking for Device mapper support (BLK_DEV_DM)"
-	linux_chkconfig_present BLK_DEV_DM
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		ewarn "TrueCrypt 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
-}
-