[gentoo-commits] gentoo-x86 commit in sys-block/partimage: partimage-0.6.9.ebuild ChangeLog

[Samuli Suominen (ssuominen)]

ssuominen    12/03/04 09:57:05

  Modified:             partimage-0.6.9.ebuild ChangeLog
  Log:
  Fix building with zlib >= 1.2.5.2 wrt #405323 by Xavier Miller and Manfred Knick
  
  (Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sys-block/partimage/partimage-0.6.9.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/partimage/partimage-0.6.9.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/partimage/partimage-0.6.9.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/partimage/partimage-0.6.9.ebuild?r1=1.1&r2=1.2

Index: partimage-0.6.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.9.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- partimage-0.6.9.ebuild	19 Nov 2010 19:36:33 -0000	1.1
+++ partimage-0.6.9.ebuild	4 Mar 2012 09:57:05 -0000	1.2
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.9.ebuild,v 1.1 2010/11/19 19:36:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.9.ebuild,v 1.2 2012/03/04 09:57:05 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit eutils flag-o-matic pam
 
 DESCRIPTION="Console-based application to efficiently save raw partition data to an image file"
@@ -31,6 +31,10 @@
 	enewuser partimag 91 -1 /var/lib/partimage partimag
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-zlib-1.2.5.2.patch #405323
+}
+
 src_configure() {
 	# XXX: Do we still need these?
 	filter-flags -fno-exceptions
@@ -48,7 +52,6 @@
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--sysconfdir="${EPREFIX}"/etc \
 		$(use_enable nls) \
-		--disable-dependency-tracking \
 		$(use_enable ssl) \
 		--disable-pam \
 		$(use_enable static all-static) \
@@ -57,26 +60,25 @@
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc BOOT-ROOT.txt FORMAT FUTURE THANKS
+	default
 
 	keepdir /var/lib/partimage
 	keepdir /var/log/partimage
 
-	newinitd "${FILESDIR}"/partimaged.init.2 partimaged || die
-	newconfd "${FILESDIR}"/partimaged.conf partimaged || die
+	newinitd "${FILESDIR}"/partimaged.init.2 partimaged
+	newconfd "${FILESDIR}"/partimaged.conf partimaged
 
 	if use ssl; then
 		insinto /etc/partimaged
-		doins "${FILESDIR}"/servercert.cnf || die
+		doins "${FILESDIR}"/servercert.cnf
 	fi
 
 	if use pam; then
-		newpamd "${FILESDIR}"/partimaged.pam.2 partimaged || die
+		newpamd "${FILESDIR}"/partimaged.pam.2 partimaged
 	fi
 }
 
-confdir=${ROOT}etc/partimaged
+confdir=${EROOT}/etc/partimaged
 privkey=${confdir}/partimaged.key
 cnf=${confdir}/servercert.cnf
 csr=${confdir}/partimaged.csr
@@ -89,24 +91,24 @@
 		read
 		if [ ! -f ${privkey} ]; then
 			einfo "Generating unencrypted private key: ${privkey}"
-			openssl genrsa -out ${privkey} 1024  || die "Failed!"
+			openssl genrsa -out ${privkey} 1024 || die
 		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!"
+			openssl req -new -x509 -outform PEM -out ${csr} -key ${privkey} -config ${cnf} || die
 		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!"
+			openssl x509 -in ${csr} -out ${cert} -signkey ${privkey} || die
 		else
 			einfo "Self-signed certifcate already exists: ${cert}"
 		fi
 		einfo "Setting permissions"
-		partimagesslperms || die "Failed!"
+		partimagesslperms || die
 		einfo "Done"
 	else
 		einfo "SSL is disabled, not building certificates"
@@ -133,5 +135,5 @@
 		partimagesslperms
 		return 0
 	fi
-	chown partimag:0 "${ROOT}"etc/partimaged/partimagedusers || die
+	chown partimag:0 "${EROOT}"/etc/partimaged/partimagedusers || die
 }



1.50                 sys-block/partimage/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/partimage/ChangeLog?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/partimage/ChangeLog?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/partimage/ChangeLog?r1=1.49&r2=1.50

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ChangeLog	19 Nov 2010 19:36:33 -0000	1.49
+++ ChangeLog	4 Mar 2012 09:57:05 -0000	1.50
@@ -1,6 +1,11 @@
 # ChangeLog for sys-block/partimage
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.49 2010/11/19 19:36:33 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.50 2012/03/04 09:57:05 ssuominen Exp $
+
+  04 Mar 2012; Samuli Suominen <ssuominen@g.o> partimage-0.6.9.ebuild,
+  +files/partimage-0.6.9-zlib-1.2.5.2.patch:
+  Fix building with zlib >= 1.2.5.2 wrt #405323 by Xavier Miller and Manfred
+  Knick
 
 *partimage-0.6.9 (19 Nov 2010)