removed old ebuilds, fixed datadir path. fixed bug #112369.

(Portage version: 2.0.51.22-r3)

13 files changed, 67 insertions, 541 deletions

diff --git a/sys-block/partimage/ChangeLog b/sys-block/partimage/ChangeLog
index 3845819709a1..9ad32e9148f7 100644
--- a/sys-block/partimage/ChangeLog
+++ b/sys-block/partimage/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-block/partimage
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.16 2005/11/12 16:48:00 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.17 2005/11/13 17:30:45 xmerlin Exp $
+
+  13 Nov 2005; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/partimage-0.6.4-datadir-path.patch, -partimage-0.6.2.ebuild,
+  -partimage-0.6.4-r1.ebuild, -partimage-0.6.4-r2.ebuild,
+  partimage-0.6.4-r3.ebuild, partimage-0.6.4-r4.ebuild,
+  -partimage-0.6.4.ebuild:
+  removed old ebuilds, fixed datadir path.
+  removed unneeded lzo dep, fixed bug #112369.
 
   12 Nov 2005; Christian Zoffoli <xmerlin@gentoo.org> partimage-0.6.2.ebuild,
   partimage-0.6.4-r1.ebuild, partimage-0.6.4-r2.ebuild,
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index c7678b49afe2..286a0b066d54 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 22276ab78647ed084e4bc70460ff93ac ChangeLog 6660
+MD5 1e78591ad71a6a1f22e9ddfb50330534 ChangeLog 7016
 MD5 6b4c83400b7b7a44afb53e1a7ac388af metadata.xml 300
-MD5 0f2ae57da42f298111442dbed1698e37 partimage-0.6.2.ebuild 1704
-MD5 3842bd9bf95cd80d2702726bd962fa07 partimage-0.6.4-r1.ebuild 4464
-MD5 8d2691568adcc78816245bce843a5f0c partimage-0.6.4-r2.ebuild 3913
-MD5 7e94fba96f91ecc6f8d46839aa83df5c partimage-0.6.4-r3.ebuild 4128
-MD5 d2c77adccec6d7a46a58f8b9e6e6f4c6 partimage-0.6.4.ebuild 4133
-MD5 8b9da5e9fcea742185d21c36e7e68646 partimage-0.6.4-r4.ebuild 4714
-MD5 6fd04332b7f640a2aa71f208d2bd2dc8 files/digest-partimage-0.6.2 68
-MD5 3bbd1e2fc0dd50034c600d01d08e8997 files/digest-partimage-0.6.4 68
-MD5 3bbd1e2fc0dd50034c600d01d08e8997 files/digest-partimage-0.6.4-r1 68
-MD5 3bbd1e2fc0dd50034c600d01d08e8997 files/digest-partimage-0.6.4-r2 68
+MD5 65b772913cdf26b6263abd14658701e5 partimage-0.6.4-r3.ebuild 4214
+MD5 4188e6cd8a597b79a0fc3abb297ef985 partimage-0.6.4-r4.ebuild 4800
 MD5 3bbd1e2fc0dd50034c600d01d08e8997 files/digest-partimage-0.6.4-r3 68
 MD5 60b6a720fc1d32cb9325428d7aeb49c2 files/partimage-0.6.4-LP64-fixes.patch 1773
 MD5 8fea14f38734fb0bbf6239671f5fff4b files/partimage-0.6.4-chown.patch 1660
@@ -27,10 +16,4 @@ MD5 86ccd8a7d116f22182ae60e01da1bfff files/partimaged.init 756
 MD5 938ecb802f7e26ff8df88404f0648c7c files/partimagedusers.5 1263
 MD5 b854c74900be1967b69b5997a434897c files/servercert.cnf 1096
 MD5 3bbd1e2fc0dd50034c600d01d08e8997 files/digest-partimage-0.6.4-r4 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDdh0VgMUyd/cdjWsRAkqWAJ9lpAHrsi6XbYfsxH0cSZy3ZWoHtgCeIR7u
-qXqQi3Q/9ahmuPdx5rJGwfY=
-=llF0
------END PGP SIGNATURE-----
+MD5 12ba93fccf3cc6ddb16d47744ebae6a9 files/partimage-0.6.4-datadir-path.patch 1669
diff --git a/sys-block/partimage/files/digest-partimage-0.6.2 b/sys-block/partimage/files/digest-partimage-0.6.2
deleted file mode 100644
index 6d5fcacac91f..000000000000
--- a/sys-block/partimage/files/digest-partimage-0.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c52ca81f23876cf9baa0dfcaa44d52ac partimage-0.6.2.tar.bz2 668265
diff --git a/sys-block/partimage/files/digest-partimage-0.6.4 b/sys-block/partimage/files/digest-partimage-0.6.4
deleted file mode 100644
index f525923985b4..000000000000
--- a/sys-block/partimage/files/digest-partimage-0.6.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee56df4a6be1f78f53dc48454655aa8a partimage-0.6.4.tar.bz2 654707
diff --git a/sys-block/partimage/files/digest-partimage-0.6.4-r1 b/sys-block/partimage/files/digest-partimage-0.6.4-r1
deleted file mode 100644
index f525923985b4..000000000000
--- a/sys-block/partimage/files/digest-partimage-0.6.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee56df4a6be1f78f53dc48454655aa8a partimage-0.6.4.tar.bz2 654707
diff --git a/sys-block/partimage/files/digest-partimage-0.6.4-r2 b/sys-block/partimage/files/digest-partimage-0.6.4-r2
deleted file mode 100644
index f525923985b4..000000000000
--- a/sys-block/partimage/files/digest-partimage-0.6.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee56df4a6be1f78f53dc48454655aa8a partimage-0.6.4.tar.bz2 654707
diff --git a/sys-block/partimage/files/partimage-0.6.4-datadir-path.patch b/sys-block/partimage/files/partimage-0.6.4-datadir-path.patch
new file mode 100644
index 000000000000..97415a821d1b
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.4-datadir-path.patch
@@ -0,0 +1,34 @@
+--- partimage-0.6.4/Makefile.in.orig	2005-11-13 18:08:05.558622488 +0100
++++ partimage-0.6.4/Makefile.in	2005-11-13 18:08:47.669220704 +0100
+@@ -668,21 +668,21 @@
+ 	@echo "/etc/pam.d/partimaged"
+ 
+ install-data-local:
+-	$(mkinstalldirs) ${sysconfdir}
+-	$(mkinstalldirs) ${sysconfdir}/partimaged
++	$(mkinstalldirs) ${DESTDIR}${sysconfdir}
++	$(mkinstalldirs) ${DESTDIR}${sysconfdir}/partimaged
+ 
+-	if test ! -f ${sysconfdir}/partimaged/partimagedusers ; then \
++	if test ! -f ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ; then \
+ 	echo "# note: '#' introduces comments" > \
+-          ${sysconfdir}/partimaged/partimagedusers ;\
++          ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
+ 	echo -n "#add only users allowed to " >>  \
+-           ${sysconfdir}/partimaged/partimagedusers ;\
+-	echo "connect partimaged" >> ${sysconfdir}/partimaged/partimagedusers ;\
++           ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
++	echo "connect partimaged" >> ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
+ 	echo "# (only one login per line)" >> \
+-           ${sysconfdir}/partimaged/partimagedusers ;\
+-	echo "" >> ${sysconfdir}/partimaged/partimagedusers ;\
++           ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
++	echo "" >> ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
+ 	echo "#sample # user 'sample' is allowed to connect partimaged" >> \
+-           ${sysconfdir}/partimaged/partimagedusers ;\
+-	chmod 600 ${sysconfdir}/partimaged/partimagedusers ;\
++           ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
++	chmod 600 ${DESTDIR}${sysconfdir}/partimaged/partimagedusers ;\
+ 	fi 
+ 
+ 	#$(mkinstalldirs) ${infodir}
diff --git a/sys-block/partimage/partimage-0.6.2.ebuild b/sys-block/partimage/partimage-0.6.2.ebuild
deleted file mode 100644
index 89b7c92fa63d..000000000000
--- a/sys-block/partimage/partimage-0.6.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.2.ebuild,v 1.3 2005/11/12 16:48:00 xmerlin Exp $
-
-inherit gnuconfig
-
-DESCRIPTION="Console-based application to efficiently save raw partition data to an image file. Optional encryption/compression support."
-HOMEPAGE="http://www.partimage.org/"
-SRC_URI="mirror://sourceforge/partimage/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="ssl"
-
-RDEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/lzo-1.08
-	>=dev-libs/newt-0.50.35-r1
-	>=sys-libs/slang-1.4.5-r2
-	app-arch/bzip2
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-DEPEND="${RDEPEND} sys-devel/autoconf"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# Patch Makefile.am so we can take over some of is install work
-	#patch -p1 < ${FILESDIR}/${PF}-gentoo.patch || die "patch failed"
-	autoconf
-
-	gnuconfig_update
-}
-
-src_compile() {
-	# SSL is optional
-	local sslconf
-	use ssl || sslconf="--disable-ssl"
-	econf \
-		${sslconf} \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/doc/${PF} || die "econf failed"
-	cp Makefile Makefile.orig
-	sed -e "s/partimag\.root/root:root/g" Makefile.orig > Makefile
-	emake || die
-}
-
-src_install() {
-	make \
-	prefix=${D}/usr \
-	sysconfdir=${D}/etc \
-	mandir=${D}/usr/share/man \
-	infodir=${D}/usr/share/doc/${PF} \
-	localedir=${D}/usr/share/locale \
-	gettextsrcdir=${D}/usr/share/gettext/po \
-	install || die
-
-	# init.d / conf.d
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}d.init ${PN}d || die
-	insinto /etc/conf.d ; newins ${FILESDIR}/${PN}d.conf ${PN}d || die
-
-	doman debian/partimage.1 debian/partimaged.8 ${FILESDIR}/partimagedusers.5 || die
-}
diff --git a/sys-block/partimage/partimage-0.6.4-r1.ebuild b/sys-block/partimage/partimage-0.6.4-r1.ebuild
deleted file mode 100644
index ddeaaaf16ddc..000000000000
--- a/sys-block/partimage/partimage-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r1.ebuild,v 1.6 2005/11/12 16:48:00 xmerlin Exp $
-
-inherit gnuconfig eutils
-
-DESCRIPTION="Console-based application to efficiently save raw partition data to an image file. Optional encryption/compression support."
-HOMEPAGE="http://www.partimage.org/"
-SRC_URI="mirror://sourceforge/partimage/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="ssl nologin"
-
-RDEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/lzo-1.08
-	>=dev-libs/newt-0.50.35-r1
-	>=sys-libs/slang-1.4.5-r2
-	app-arch/bzip2
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-DEPEND="${RDEPEND} sys-devel/autoconf"
-
-PARTIMAG_GROUP_GID=91
-PARTIMAG_USER_UID=91
-PARTIMAG_GROUP_NAME=partimag
-PARTIMAG_USER_NAME=partimag
-PARTIMAG_USER_SH=/bin/false
-PARTIMAG_USER_HOMEDIR=/var/log/partimage
-PARTIMAG_USER_GROUPS=partimag
-
-pkg_setup() {
-	# Now add users if needed
-	enewgroup ${PARTIMAG_GROUP_NAME} ${PARTIMAG_GROUP_GID}
-	enewuser ${PARTIMAG_USER_NAME} ${PARTIMAG_USER_UID} ${PARTIMAG_USER_SH} ${PARTIMAG_USER_HOMEDIR} ${PARTIMAG_USER_GROUPS}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# we can do better security ourselves
-	epatch ${FILESDIR}/${P}-nodumbpermchecks.diff
-	epatch ${FILESDIR}/${P}-fixserverargs.diff
-	# Patch Makefile.am so we can take over some of is install work
-	#patch -p1 < ${FILESDIR}/${PF}-gentoo.patch || die "patch failed"
-	sed '18d' -i configure.ac
-	sed '1iACLOCAL_AMFLAGS = -I macros' -i Makefile.am
-	for i in intl/Makefile.in po/Makefile.in.in; do
-		sed 's/^mkinstalldirs =.*/mkinstalldirs = mkdir -p /g' -i ${i}
-	done
-	sed 's/chown partimag.root/chown partimag:0/g' -i Makefile.am
-	gnuconfig_update
-	automake
-	aclocal
-	autoconf
-}
-
-src_compile() {
-	# SSL is optional
-	local myconf
-	myconf="--cache-file=${S}/config.cache"
-	use ssl || myconf="${myconf} --disable-ssl"
-	use nologin && myconf="${myconf} --disable-login"
-	econf \
-		${myconf} \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/doc/${PF} || die "econf failed"
-	cp Makefile Makefile.orig
-	sed -e "s/partimag\.root/root:root/g" Makefile.orig > Makefile
-	emake || die
-}
-
-src_install() {
-	make \
-	prefix=${D}/usr \
-	sysconfdir=${D}/etc \
-	mandir=${D}/usr/share/man \
-	datadir=${D}/usr/share \
-	infodir=${D}/usr/share/doc/${PF} \
-	localedir=${D}/usr/share/locale \
-	gettextsrcdir=${D}/usr/share/gettext/po \
-	install || die
-	keepdir /var/log/partimage
-	insinto /etc/partimaged
-	doins ${FILESDIR}/servercert.cnf
-
-	# init.d / conf.d
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}d.init ${PN}d || die
-	insinto /etc/conf.d ; newins ${FILESDIR}/${PN}d.conf ${PN}d || die
-
-	doman debian/partimage.1 debian/partimaged.8 ${FILESDIR}/partimagedusers.5 || die
-}
-
-# vars for SSL stuff
-confdir="${ROOT}etc/partimaged"
-privkey="${confdir}/partimaged.key"
-cnf="${confdir}/servercert.cnf"
-csr="${confdir}/partimaged.csr"
-cert="${confdir}/partimaged.cert"
-
-pkg_config() {
-	if use ssl; then
-		ewarn "Please customize /etc/partimaged/servercert.cnf before you continue!"
-		ewarn "Press Ctrl-C to break now for it, or press enter to continue."
-		read
-		if [ ! -f ${privkey} ]; then
-			einfo "Generating unencrypted private key: ${privkey}"
-			openssl genrsa -out ${privkey} 1024  || die "Failed!"
-		else
-			einfo "Private key already exists: ${privkey}"
-		fi
-		if [ ! -f ${csr} ]; then
-			einfo "Generating certificate request: ${csr}"
-			openssl req -new -x509 -outform PEM -out ${csr} -key ${privkey} -config ${cnf} || die "Failed!"
-		else
-			einfo "Certificate request already exists: ${csr}"
-		fi
-		if [ ! -f ${cert} ]; then
-			einfo "Generating self-signed certificate: ${cert}"
-			openssl x509 -in ${csr} -out ${cert} -signkey ${privkey} || die "Failed!"
-		else
-			einfo "Self-signed certifcate already exists: ${cert}"
-		fi
-		einfo "Setting permissions"
-		partimagesslperms || die "Failed!"
-		einfo "Done"
-	else
-		einfo "SSL is disabled, not building certificates"
-	fi
-}
-
-partimagesslperms() {
-	local ret=0
-	chmod 600 ${privkey} 2>/dev/null
-	ret=$((${ret}+$?))
-	chown partimag:0 ${privkey} 2>/dev/null
-	ret=$((${ret}+$?))
-	chmod 644 ${cert} ${csr} 2>/dev/null
-	ret=$((${ret}+$?))
-	chown root:0 ${cert} ${csr} 2>/dev/null
-	ret=$((${ret}+$?))
-	return $ret
-}
-
-pkg_postinst() {
-	if use ssl; then
-		einfo "To create the required SSL certificates, please do:"
-		einfo "emerge  --config =${PF}"
-		# force a permmissions fixup
-		partimagesslperms
-		return 0
-	fi
-}
diff --git a/sys-block/partimage/partimage-0.6.4-r2.ebuild b/sys-block/partimage/partimage-0.6.4-r2.ebuild
deleted file mode 100644
index ae9325c9de3c..000000000000
--- a/sys-block/partimage/partimage-0.6.4-r2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r2.ebuild,v 1.10 2005/11/12 16:48:00 xmerlin Exp $
-
-inherit gnuconfig eutils flag-o-matic
-
-DESCRIPTION="Console-based application to efficiently save raw partition data to an image file. Optional encryption/compression support."
-HOMEPAGE="http://www.partimage.org/"
-SRC_URI="mirror://sourceforge/partimage/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE="ssl nologin nls"
-
-DEPEND="${RDEPEND} sys-devel/autoconf"
-
-RDEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/lzo-1.08
-	>=dev-libs/newt-0.51.6
-	app-arch/bzip2
-	>=sys-libs/slang-1.4.5-r2
-	nls? ( sys-devel/gettext )
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-PARTIMAG_GROUP_GID=91
-PARTIMAG_USER_UID=91
-PARTIMAG_GROUP_NAME=partimag
-PARTIMAG_USER_NAME=partimag
-PARTIMAG_USER_SH=/bin/false
-PARTIMAG_USER_HOMEDIR=/var/log/partimage
-PARTIMAG_USER_GROUPS=partimag
-
-pkg_setup() {
-	# Now add users if needed
-	enewgroup ${PARTIMAG_GROUP_NAME} ${PARTIMAG_GROUP_GID}
-	enewuser ${PARTIMAG_USER_NAME} ${PARTIMAG_USER_UID} ${PARTIMAG_USER_SH} ${PARTIMAG_USER_HOMEDIR} ${PARTIMAG_USER_GROUPS}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# we can do better security ourselves
-	epatch ${FILESDIR}/${P}-nodumbpermchecks.diff
-	epatch ${FILESDIR}/${P}-chown.patch
-	epatch ${FILESDIR}/${P}-not_install_info.patch
-	epatch ${FILESDIR}/${P}-fixserverargs.diff
-}
-
-src_compile() {
-	filter-flags -fno-exceptions
-
-	local myconf
-	use nologin && myconf="${myconf} --disable-login"
-
-	econf \
-		${myconf} \
-		--sysconfdir=/etc \
-		`use_enable ssl` \
-		`use_enable nls`|| die "econf failed"
-
-	emake || die
-}
-
-src_install() {
-	einstall \
-		MKINSTALLDIRS=/usr/share/automake-1.8/mkinstalldirs || die
-
-	keepdir /var/log/partimage
-
-	insinto /etc/partimaged; doins ${FILESDIR}/servercert.cnf || die
-
-	# init.d / conf.d
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}d.init ${PN}d || die
-	insinto /etc/conf.d ; newins ${FILESDIR}/${PN}d.conf ${PN}d || die
-
-	doman debian/partimage.1 debian/partimaged.8 ${FILESDIR}/partimagedusers.5 || die
-	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL README* TODO partimage.lsm
-}
-
-# vars for SSL stuff
-confdir="${ROOT}etc/partimaged"
-privkey="${confdir}/partimaged.key"
-cnf="${confdir}/servercert.cnf"
-csr="${confdir}/partimaged.csr"
-cert="${confdir}/partimaged.cert"
-
-pkg_config() {
-	if use ssl; then
-		ewarn "Please customize /etc/partimaged/servercert.cnf before you continue!"
-		ewarn "Press Ctrl-C to break now for it, or press enter to continue."
-		read
-		if [ ! -f ${privkey} ]; then
-			einfo "Generating unencrypted private key: ${privkey}"
-			openssl genrsa -out ${privkey} 1024  || die "Failed!"
-		else
-			einfo "Private key already exists: ${privkey}"
-		fi
-		if [ ! -f ${csr} ]; then
-			einfo "Generating certificate request: ${csr}"
-			openssl req -new -x509 -outform PEM -out ${csr} -key ${privkey} -config ${cnf} || die "Failed!"
-		else
-			einfo "Certificate request already exists: ${csr}"
-		fi
-		if [ ! -f ${cert} ]; then
-			einfo "Generating self-signed certificate: ${cert}"
-			openssl x509 -in ${csr} -out ${cert} -signkey ${privkey} || die "Failed!"
-		else
-			einfo "Self-signed certifcate already exists: ${cert}"
-		fi
-		einfo "Setting permissions"
-		partimagesslperms || die "Failed!"
-		einfo "Done"
-	else
-		einfo "SSL is disabled, not building certificates"
-	fi
-}
-
-partimagesslperms() {
-	local ret=0
-	chmod 600 ${privkey} 2>/dev/null
-	ret=$((${ret}+$?))
-	chown partimag:0 ${privkey} 2>/dev/null
-	ret=$((${ret}+$?))
-	chmod 644 ${cert} ${csr} 2>/dev/null
-	ret=$((${ret}+$?))
-	chown root:0 ${cert} ${csr} 2>/dev/null
-	ret=$((${ret}+$?))
-	return $ret
-}
-
-pkg_postinst() {
-	if use ssl; then
-		einfo "To create the required SSL certificates, please do:"
-		einfo "emerge  --config =${PF}"
-		# force a permmissions fixup
-		partimagesslperms
-		return 0
-	fi
-}
diff --git a/sys-block/partimage/partimage-0.6.4-r3.ebuild b/sys-block/partimage/partimage-0.6.4-r3.ebuild
index 214634be9f96..1a4ca6778488 100644
--- a/sys-block/partimage/partimage-0.6.4-r3.ebuild
+++ b/sys-block/partimage/partimage-0.6.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r3.ebuild,v 1.11 2005/11/12 16:48:00 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r3.ebuild,v 1.12 2005/11/13 17:30:45 xmerlin Exp $
 
 inherit gnuconfig eutils flag-o-matic
 
@@ -16,7 +16,6 @@ DEPEND="${RDEPEND} sys-devel/autoconf"
 
 RDEPEND="virtual/libc
 	>=sys-libs/zlib-1.1.4
-	>=dev-libs/lzo-1.08
 	>=dev-libs/newt-0.51.6
 	app-arch/bzip2
 	>=sys-libs/slang-1.4.5-r2
@@ -42,14 +41,15 @@ src_unpack() {
 	cd ${S}
 
 	# we can do better security ourselves
-	epatch ${FILESDIR}/${P}-nodumbpermchecks.diff
-	epatch ${FILESDIR}/${P}-chown.patch
-	epatch ${FILESDIR}/${P}-not_install_info.patch
-	epatch ${FILESDIR}/${P}-fixserverargs.diff
-	epatch ${FILESDIR}/${P}-lib64.patch
-	epatch ${FILESDIR}/${P}-fflush-before-re-read-partition-table.patch
-	epatch ${FILESDIR}/${P}-LP64-fixes.patch
-	epatch ${FILESDIR}/${P}-save_all_and_rest_all_actions.patch
+	epatch ${FILESDIR}/${P}-nodumbpermchecks.diff || die
+	epatch ${FILESDIR}/${P}-chown.patch || die
+	epatch ${FILESDIR}/${P}-not_install_info.patch || die
+	epatch ${FILESDIR}/${P}-fixserverargs.diff || die
+	epatch ${FILESDIR}/${P}-lib64.patch || die
+	epatch ${FILESDIR}/${P}-fflush-before-re-read-partition-table.patch || die
+	epatch ${FILESDIR}/${P}-LP64-fixes.patch || die
+	epatch ${FILESDIR}/${P}-save_all_and_rest_all_actions.patch || die
+	epatch ${FILESDIR}/${P}-datadir-path.patch || die
 }
 
 src_compile() {
diff --git a/sys-block/partimage/partimage-0.6.4-r4.ebuild b/sys-block/partimage/partimage-0.6.4-r4.ebuild
index 6c2cd0aaeb59..f06a464d13ff 100644
--- a/sys-block/partimage/partimage-0.6.4-r4.ebuild
+++ b/sys-block/partimage/partimage-0.6.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r4.ebuild,v 1.6 2005/11/12 16:48:00 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r4.ebuild,v 1.7 2005/11/13 17:30:45 xmerlin Exp $
 
 inherit eutils flag-o-matic pam
 
@@ -14,7 +14,6 @@ IUSE="ssl nologin nls pam static"
 
 DEPEND="virtual/libc
 	>=sys-libs/zlib-1.1.4
-	>=dev-libs/lzo-1.08
 	>=dev-libs/newt-0.51.6
 	app-arch/bzip2
 	>=sys-libs/slang-1.4.5-r2
@@ -52,14 +51,15 @@ src_unpack() {
 	cd ${S}
 
 	# we can do better security ourselves
-	epatch ${FILESDIR}/${P}-nodumbpermchecks.diff
-	epatch ${FILESDIR}/${P}-chown.patch
-	epatch ${FILESDIR}/${P}-not_install_info.patch
-	epatch ${FILESDIR}/${P}-fixserverargs.diff
-	epatch ${FILESDIR}/${P}-lib64.patch
-	epatch ${FILESDIR}/${P}-fflush-before-re-read-partition-table.patch
-	epatch ${FILESDIR}/${P}-LP64-fixes.patch
-	epatch ${FILESDIR}/${P}-save_all_and_rest_all_actions.patch
+	epatch ${FILESDIR}/${P}-nodumbpermchecks.diff || die
+	epatch ${FILESDIR}/${P}-chown.patch || die
+	epatch ${FILESDIR}/${P}-not_install_info.patch || die
+	epatch ${FILESDIR}/${P}-fixserverargs.diff || die
+	epatch ${FILESDIR}/${P}-lib64.patch || die
+	epatch ${FILESDIR}/${P}-fflush-before-re-read-partition-table.patch || die
+	epatch ${FILESDIR}/${P}-LP64-fixes.patch || die
+	epatch ${FILESDIR}/${P}-save_all_and_rest_all_actions.patch || die
+	epatch ${FILESDIR}/${P}-datadir-path.patch || die
 }
 
 src_compile() {
diff --git a/sys-block/partimage/partimage-0.6.4.ebuild b/sys-block/partimage/partimage-0.6.4.ebuild
deleted file mode 100644
index 4676da3ca8c3..000000000000
--- a/sys-block/partimage/partimage-0.6.4.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4.ebuild,v 1.6 2005/11/12 16:48:00 xmerlin Exp $
-
-inherit gnuconfig eutils
-
-DESCRIPTION="Console-based application to efficiently save raw partition data to an image file. Optional encryption/compression support."
-HOMEPAGE="http://www.partimage.org/"
-SRC_URI="mirror://sourceforge/partimage/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="ssl nologin"
-
-RDEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/lzo-1.08
-	>=dev-libs/newt-0.50.35-r1
-	>=sys-libs/slang-1.4.5-r2
-	app-arch/bzip2
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-DEPEND="${RDEPEND} sys-devel/autoconf"
-
-PARTIMAG_GROUP_GID=91
-PARTIMAG_USER_UID=91
-PARTIMAG_GROUP_NAME=partimag
-PARTIMAG_USER_NAME=partimag
-PARTIMAG_USER_SH=/bin/false
-PARTIMAG_USER_HOMEDIR=/var/log/partimage
-PARTIMAG_USER_GROUPS=partimag
-
-pkg_setup() {
-	# Now add users if needed
-	enewgroup ${PARTIMAG_GROUP_NAME} ${PARTIMAG_GROUP_GID}
-	enewuser ${PARTIMAG_USER_NAME} ${PARTIMAG_USER_UID} ${PARTIMAG_USER_SH} ${PARTIMAG_USER_HOMEDIR} ${PARTIMAG_USER_GROUPS}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-fixserverargs.diff
-	# Patch Makefile.am so we can take over some of is install work
-	#patch -p1 < ${FILESDIR}/${PF}-gentoo.patch || die "patch failed"
-	sed '18d' -i configure.ac
-	sed '1iACLOCAL_AMFLAGS = -I macros' -i Makefile.am
-	for i in intl/Makefile.in po/Makefile.in.in; do
-		sed 's/^mkinstalldirs =.*/mkinstalldirs = mkdir -p /g' -i ${i}
-	done
-	sed 's/chown partimag.root/chown partimag:0/g' -i Makefile.am
-	gnuconfig_update
-	automake
-	aclocal
-	autoconf
-}
-
-src_compile() {
-	# SSL is optional
-	local myconf
-	myconf="--cache-file=${S}/config.cache"
-	use ssl || myconf="${myconf} --disable-ssl"
-	use nologin && myconf="${myconf} --disable-login"
-	econf \
-		${myconf} \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/doc/${PF} || die "econf failed"
-	cp Makefile Makefile.orig
-	sed -e "s/partimag\.root/root:0/g" Makefile.orig > Makefile
-	emake || die
-}
-
-src_install() {
-	make \
-	prefix=${D}/usr \
-	sysconfdir=${D}/etc \
-	mandir=${D}/usr/share/man \
-	datadir=${D}/usr/share \
-	infodir=${D}/usr/share/doc/${PF} \
-	localedir=${D}/usr/share/locale \
-	gettextsrcdir=${D}/usr/share/gettext/po \
-	install || die
-	keepdir /var/log/partimage
-	insinto /etc/partimaged
-	doins ${FILESDIR}/servercert.cnf
-
-	# init.d / conf.d
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}d.init ${PN}d || die
-	insinto /etc/conf.d ; newins ${FILESDIR}/${PN}d.conf ${PN}d || die
-
-	doman debian/partimage.1 debian/partimaged.8 ${FILESDIR}/partimagedusers.5 || die
-}
-
-pkg_config() {
-	local dir=${ROOT}etc/partimaged
-	privkey="${dir}/partimaged.key"
-	cnf="${dir}/servercert.cnf"
-	csr="${dir}/partimaged.csr"
-	cert="${dir}/partimaged.cert"
-	if use ssl; then
-		ewarn "Please customize /etc/partimaged/servercert.cnf before you continue!"
-		ewarn "Press Ctrl-C to break now for it, or press enter to continue."
-		read
-		if [ ! -f ${privkey} ]; then
-			einfo "Generating unencrypted private key: ${privkey}"
-			openssl genrsa -out ${privkey} 1024  || die "Failed!"
-		else
-			einfo "Private key already exists: ${privkey}"
-		fi
-		if [ ! -f ${csr} ]; then
-			einfo "Generating certificate request: ${csr}"
-			openssl req -new -x509 -outform PEM -out ${csr} -key ${privkey} -config ${cnf} || die "Failed!"
-		else
-			einfo "Certificate request already exists: ${csr}"
-		fi
-		if [ ! -f ${cert} ]; then
-			einfo "Generating self-signed certificate: ${cert}"
-			openssl x509 -in ${csr} -out ${cert} -signkey ${privkey} || die "Failed!"
-		else
-			einfo "Self-signed certifcate already exists: ${cert}"
-		fi
-		einfo "Setting permissions"
-		chmod 600 ${privkey} || die "Failed!"
-		chown partimag:0 ${privkey} || die "Failed!"
-		chmod 644 ${cert} ${csr} || die "Failed!"
-		chown root:0 ${cert} ${csr} || die "Failed!"
-		einfo "Done"
-	else
-		einfo "SSL is disabled, not building certificates"
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		einfo "To create the required SSL certificates, please do:"
-		einfo "emerge  --config =${PF}"
-	fi
-}