Clean up and push into stable.

diff --git a/sys-apps/parted/ChangeLog b/sys-apps/parted/ChangeLog
index 31faa1f37f9c2b45cc1d60f51234156d1530abc9..ce1dfc870838730841cd04d68ebf8e1530135ab4 100644 (file)
--- a/sys-apps/parted/ChangeLog
+++ b/sys-apps/parted/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/parted
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/ChangeLog,v 1.58 2004/11/30 20:56:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/ChangeLog,v 1.59 2004/12/14 00:30:44 vapier Exp $
+
+  13 Dec 2004; Mike Frysinger <vapier@gentoo.org> parted-1.6.15.ebuild:
+  Clean up and push into stable.
 
   30 Nov 2004; Luca Barbato <lu_zero@gentoo.org> parted-1.6.15.ebuild:
   Fix libtool, research and fix from Joe Jezak <josejx@gentoo.org>, solves bug

diff --git a/sys-apps/parted/Manifest b/sys-apps/parted/Manifest
index 8e05d8ace297905672be43c274fda239809ef92e..656c7ff0d11f9250457987a4e7c4af00dbcb5d29 100644 (file)
--- a/sys-apps/parted/Manifest
+++ b/sys-apps/parted/Manifest
@@ -1,8 +1,18 @@
-MD5 97d937fae5908c5b9428a43710bdcdde ChangeLog 9325
-MD5 e770f45416c1e775e6445649376cef4a parted-1.6.6.ebuild 1332
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6f764c763e0b50deffb7efedf48c75ee ChangeLog 9430
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 e770f45416c1e775e6445649376cef4a parted-1.6.6.ebuild 1332
 MD5 164e63e6a0ec131c3c6213dac3cf8636 parted-1.6.10-r2.ebuild 1324
-MD5 049aae9a28c63788c97cff6f88a48094 parted-1.6.15.ebuild 1394
+MD5 0582137765bb7c74900fc17962260e36 parted-1.6.15.ebuild 1401
+MD5 b020ac3a8080ad690bb3ce376e5273bb files/digest-parted-1.6.6 136
 MD5 0df9004e28daa2db544ed65f852d695c files/digest-parted-1.6.10-r2 141
 MD5 73a4f22213522b9db8d93884318e917b files/digest-parted-1.6.15 138
-MD5 b020ac3a8080ad690bb3ce376e5273bb files/digest-parted-1.6.6 136
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBvjReroRuSHgZdywRAh7UAJ4/IvVb6sBKgjfoIfKR5MQtJzOymgCfY3kB
+gdEP677mePpscfFTSp7vi3M=
+=+iv1
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/parted/parted-1.6.15.ebuild b/sys-apps/parted/parted-1.6.15.ebuild
index ba5f3d120ccc5852b6332a6a3c9a220d84c94244..ed32877418822bb8a3482f7bb68d47deabe6b489 100644 (file)
--- a/sys-apps/parted/parted-1.6.15.ebuild
+++ b/sys-apps/parted/parted-1.6.15.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.6.15.ebuild,v 1.4 2004/11/30 20:56:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.6.15.ebuild,v 1.5 2004/12/14 00:30:44 vapier Exp $
 
-inherit eutils gnuconfig
+inherit eutils
 
 DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
 HOMEPAGE="http://www.gnu.org/software/parted"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ppc ~alpha hppa ~amd64 ~ia64 ppc64"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 x86"
 IUSE="nls static readline debug"
 
 DEPEND=">=sys-fs/e2fsprogs-1.27
@@ -21,34 +21,29 @@ DEPEND=">=sys-fs/e2fsprogs-1.27
        nls? ( sys-devel/gettext )
        readline? ( >=sys-libs/readline-4.1-r4 )"
 
-PATCHDIR=${WORKDIR}/patches
-
 src_unpack() {
-       local WANT_AUTOCONF=1.7
        unpack ${A}
        cd ${S}
-       EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
-       gnuconfig_update
-       libtoolize --force
-       aclocal
-       autoconf
+       EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patches
+       aclocal || die "aclocal failed"
+       libtoolize --copy --force || die "libtoolize failed"
+       automake || die "automake failed"
+       autoconf || die "autoconf failed"
 }
 
 src_compile() {
        econf \
-               `use_with readline` \
-               `use_enable nls` \
-               `use_enable debug` \
-               `use_enable static all-static` \
+               $(use_with readline) \
+               $(use_enable nls) \
+               $(use_enable debug) \
+               $(use_enable static all-static) \
                --disable-Werror \
-               --target=${CHOST} ${myconf} || die "Configure failed"
+               ${myconf} || die "Configure failed"
        emake || die "Make failed"
 }
 
 src_install() {
-       einstall || die "Install failed"
-       dodoc ABOUT-NLS AUTHORS BUGS COPYING ChangeLog \
-               INSTALL NEWS README THANKS TODO
-       docinto doc; cd doc
-       dodoc API FAQ FAT USER.jp
+       make install DESTDIR="${D}" || die "Install failed"
+       dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README THANKS TODO
+       dodoc doc/{API,FAQ,FAT,USER.jp}
 }