Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 54 insertions, 42 deletions

diff --git a/app-crypt/chntpw/ChangeLog b/app-crypt/chntpw/ChangeLog
index 4036db3624ce..3c00782805cf 100644
--- a/app-crypt/chntpw/ChangeLog
+++ b/app-crypt/chntpw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/chntpw
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/chntpw/ChangeLog,v 1.16 2009/10/28 04:18:27 robbat2 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/chntpw/ChangeLog,v 1.17 2010/07/13 11:01:55 ssuominen Exp $
+
+*chntpw-100627 (13 Jul 2010)
+
+  13 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> +chntpw-100627.ebuild:
+  Version bump.
 
   28 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> chntpw-080526.ebuild:
   Keyword for ~amd64.
diff --git a/app-crypt/chntpw/Manifest b/app-crypt/chntpw/Manifest
index 42021ac029d7..3805b28aa295 100644
--- a/app-crypt/chntpw/Manifest
+++ b/app-crypt/chntpw/Manifest
@@ -1,4 +1,4 @@
-DIST chntpw-source-080526.zip 671748 RMD160 d1c9b9804f33226de4571a283cb00a7e91430fb4 SHA1 43c33529c00f35372a25784beaa649982e2de72a SHA256 3be15ff99c25226f6ce2b7ffe68bc667f3d82dd06fe90f5f50b165e70dfc89cc
-EBUILD chntpw-080526.ebuild 953 RMD160 6f703f77af9955ca3c255dca3d7cc7bd99248a20 SHA1 8d0d388bed5e8762ad0aa510e4fdb20a09026c86 SHA256 9c79683c69f616b95620ddb4a12e013b6db8a699f7b65ef1a30ab4e452ab4777
-MISC ChangeLog 2397 RMD160 dc2216506bd2ee5cd69dd96e38ab3b951bdbffbf SHA1 e8b008b8ddecb4243c86953aac082bef40100057 SHA256 be425dea0ec8dca7673d219d73687b7c614cdee31ba5ca1e8577d6eb255d81dd
+DIST chntpw-source-100627.zip 668647 RMD160 1d8fa3020c98bb748ac2e49e91cd77c2be649b41 SHA1 4b2a7e7a406ca9ecb68c9ab4fb6012864828806d SHA256 e972252c39f426c0acaf807ec682eacde817caa7bafa2a2c7f83539d0dcc9c9e
+EBUILD chntpw-100627.ebuild 959 RMD160 dad67a990ab8a7f5a5c9d84373f264a2f120dd0d SHA1 93e0cd33551d7ec931c925cb41d3216a04e6d626 SHA256 48be49e01a8e96389735a40b07b1543470a9ba3d7c3af5ac2e3203055b7f061e
+MISC ChangeLog 2523 RMD160 084d39fae95210f42bb675ff2e9d435dfb82da51 SHA1 9961758926272b09009b829e7a29d488465545bd SHA256 18884a7fd4b0a12805987e54d06d06ce8a81adf8d0a013d5a1802cffe9c8a317
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
diff --git a/app-crypt/chntpw/chntpw-080526.ebuild b/app-crypt/chntpw/chntpw-080526.ebuild
deleted file mode 100644
index 60faa1151f7e..000000000000
--- a/app-crypt/chntpw/chntpw-080526.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/chntpw/chntpw-080526.ebuild,v 1.4 2009/10/28 04:18:27 robbat2 Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Offline Windows NT Password & Registry Editor"
-HOMEPAGE="http://home.eunet.no/~pnordahl/ntpasswd/"
-SRC_URI="http://home.eunet.no/~pnordahl/ntpasswd/${PN}-source-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="static"
-
-RDEPEND="dev-libs/openssl"
-DEPEND="app-arch/unzip"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "/^CC/s/gcc/$(tc-getCC)/" \
-		Makefile || die "sed failed"
-}
-
-src_compile() {
-	#Makefile is hardcoded, override the defaults with the user's settings.
-	emake LIBS="-lcrypto" CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dobin chntpw
-	use static && dobin chntpw.static
-	dobin cpnt
-	dodoc HISTORY.txt README.txt regedit.txt WinReg.txt
-}
diff --git a/app-crypt/chntpw/chntpw-100627.ebuild b/app-crypt/chntpw/chntpw-100627.ebuild
new file mode 100644
index 000000000000..2c0d9a27588b
--- /dev/null
+++ b/app-crypt/chntpw/chntpw-100627.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/chntpw/chntpw-100627.ebuild,v 1.1 2010/07/13 11:01:55 ssuominen Exp $
+
+EAPI=2
+inherit toolchain-funcs
+
+DESCRIPTION="Offline Windows NT Password & Registry Editor"
+HOMEPAGE="http://pogostick.net/~pnh/ntpasswd/"
+SRC_URI="http://pogostick.net/~pnh/ntpasswd/${PN}-source-${PV}.zip"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static"
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+src_prepare() {
+	sed -i \
+		-e '/-o/s:$(CC):$(CC) $(LDFLAGS):' \
+		Makefile || die
+
+	emake clean || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} -DUSEOPENSSL -Wall" \
+		LIBS="-lcrypto" || die
+}
+
+src_install() {
+	dobin chntpw cpnt reged || die
+
+	if use static; then
+		dobin {chntpw,reged}.static || die
+	fi
+
+	dodoc {HISTORY,README,regedit,WinReg}.txt || die
+}