diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2012-03-09 08:35:48 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2012-03-09 08:35:48 +0000 |
| commit | 921b319285d0c711b8db57220e127298f17e8870 (patch) | |
| tree | 6f0798997224eb942ffd6923ad83525792f397e2 /app-crypt | |
| parent | Bump for 404163 (diff) | |
| download | gentoo-2-921b319285d0c711b8db57220e127298f17e8870.tar.gz gentoo-2-921b319285d0c711b8db57220e127298f17e8870.tar.bz2 gentoo-2-921b319285d0c711b8db57220e127298f17e8870.zip | |
Update to EAPI 4, only build static binaries when the static use flag is set, and add dependency on openssl[static-libs] for static builds (fixes bug #402629).
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/chntpw/ChangeLog | 9 | ||||
| -rw-r--r-- | app-crypt/chntpw/chntpw-110511.ebuild | 27 |
2 files changed, 22 insertions, 14 deletions
diff --git a/app-crypt/chntpw/ChangeLog b/app-crypt/chntpw/ChangeLog index 6ec6f37443d0..2d781024975a 100644 --- a/app-crypt/chntpw/ChangeLog +++ b/app-crypt/chntpw/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-crypt/chntpw -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/chntpw/ChangeLog,v 1.19 2011/05/16 16:09:59 c1pher Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/chntpw/ChangeLog,v 1.20 2012/03/09 08:35:48 radhermit Exp $ + + 09 Mar 2012; Tim Harder <radhermit@gentoo.org> chntpw-110511.ebuild: + Update to EAPI 4, only build static binaries when the static use flag is set, + and add dependency on openssl[static-libs] for static builds (fixes bug + #402629). *chntpw-110511 (16 May 2011) diff --git a/app-crypt/chntpw/chntpw-110511.ebuild b/app-crypt/chntpw/chntpw-110511.ebuild index dd62424da229..490668b3a91f 100644 --- a/app-crypt/chntpw/chntpw-110511.ebuild +++ b/app-crypt/chntpw/chntpw-110511.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/chntpw/chntpw-110511.ebuild,v 1.1 2011/05/16 16:09:59 c1pher Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/chntpw/chntpw-110511.ebuild,v 1.2 2012/03/09 08:35:48 radhermit Exp $ -EAPI=2 +EAPI=4 inherit toolchain-funcs DESCRIPTION="Offline Windows NT Password & Registry Editor" @@ -16,29 +16,32 @@ IUSE="static" RDEPEND="dev-libs/openssl" DEPEND="${RDEPEND} - app-arch/unzip" + app-arch/unzip + static? ( dev-libs/openssl[static-libs] )" src_prepare() { - sed -i \ - -e '/-o/s:$(CC):$(CC) $(LDFLAGS):' \ - Makefile || die + sed -i -e '/-o/s:$(CC):$(CC) $(LDFLAGS):' Makefile || die - emake clean || die + if ! use static ; then + sed -i -e "/^all:/s/ \(chntpw\|reged\).static//g" Makefile || die + fi + + emake clean } src_compile() { emake \ CC="$(tc-getCC)" \ CFLAGS="${CFLAGS} -DUSEOPENSSL -Wall" \ - LIBS="-lcrypto" || die + LIBS="-lcrypto" } src_install() { - dobin chntpw cpnt reged || die + dobin chntpw cpnt reged if use static; then - dobin {chntpw,reged}.static || die + dobin {chntpw,reged}.static fi - dodoc {HISTORY,README,regedit,WinReg}.txt || die + dodoc {HISTORY,README,regedit,WinReg}.txt } |