From f4dc89e03ef846422322433cae082f700ce9311a Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Wed, 21 Aug 2013 01:48:58 +0200 Subject: app-crypt/pvk: Rewrite Makefile, rename SRC_URI to name src_unpack can handle in a generic way, use SLOTed DEPEND Package-Manager: portage-2.2.0 --- app-crypt/pvk/ChangeLog | 5 ++ app-crypt/pvk/Manifest | 7 +- app-crypt/pvk/files/pvk-0.12-Makefile-rework.diff | 81 +++++++++++++++++++++++ app-crypt/pvk/pvk-0.12.ebuild | 23 ++----- 4 files changed, 96 insertions(+), 20 deletions(-) create mode 100644 app-crypt/pvk/files/pvk-0.12-Makefile-rework.diff (limited to 'app-crypt') diff --git a/app-crypt/pvk/ChangeLog b/app-crypt/pvk/ChangeLog index 4d2205ca..16d10ffc 100644 --- a/app-crypt/pvk/ChangeLog +++ b/app-crypt/pvk/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 20 Aug 2013; Bertrand Jacquin + +files/pvk-0.12-Makefile-rework.diff, pvk-0.12.ebuild: + app-crypt/pvk: Rewrite Makefile, rename SRC_URI to name src_unpack can handle + in a generic way, use SLOTed DEPEND + 15 Jun 2013; Bertrand Jacquin pvk-0.12.ebuild: app-crypt/pvk: Remove bad Makefile usage to deuglify ebuild diff --git a/app-crypt/pvk/Manifest b/app-crypt/pvk/Manifest index 6234da23..b8dc49ee 100644 --- a/app-crypt/pvk/Manifest +++ b/app-crypt/pvk/Manifest @@ -1,4 +1,5 @@ -DIST pvksrc.tgz.bin 7463 SHA256 181d83f4f44ba01ecc4d9d115152cc01e42d837aad9f5127201594dba12a1fa0 WHIRLPOOL b91bc52753cfaf69826994941d1bcf22abed0a623e71fec16fbc33d84c64d1782afe5480dbf387405133238a0e33ea56697206327c9fe9dad9094cccdff5356e -EBUILD pvk-0.12.ebuild 767 SHA256 65e485f4b279b77e006fc3a92c3d737d5035a27b98d3ae75460a2a604febf688 WHIRLPOOL c833be65f3b1f05bcd2212c3a8b545956b830defa53d113a97a8b5e82508da9e056b0609cdfefe0bf5885e5d748b5074685a594cee546edd0e7c77ce23e00a76 -MISC ChangeLog 803 SHA256 b2546839d8902da1d4987ea4e17ac747c5bff632c225bab75ca1755654b978eb WHIRLPOOL a2810797b51c72f29e60e286e13bcd60e361d20ad54ec5b281709ce62a383c713fb17d08ef9debcf724e103e10336bdbe7df23e99066d330bb1c056ae4e65dd9 +AUX pvk-0.12-Makefile-rework.diff 1579 SHA256 7ec67c5e749215a4dba01628fdf469a6366a37b02b4bd4adf84ee35c91c814d0 WHIRLPOOL 2c3f608436130ae8088714818db69516bec9b8fe80ca8447402be486b0c75bbfa1056bd868eac631bed84045ebfe218c03aabb77f3058342e5302509d7581e07 +DIST pvk-0.12.tgz 7463 SHA256 181d83f4f44ba01ecc4d9d115152cc01e42d837aad9f5127201594dba12a1fa0 WHIRLPOOL b91bc52753cfaf69826994941d1bcf22abed0a623e71fec16fbc33d84c64d1782afe5480dbf387405133238a0e33ea56697206327c9fe9dad9094cccdff5356e +EBUILD pvk-0.12.ebuild 638 SHA256 46a16e766231e5bc14ed05fa334841643ff96a02e5cd3e09e7e86c08d522fd42 WHIRLPOOL 5fbd1ebd4e1afa13cf826d7a5053117de5b802127a0ae134ad093f45195db2080643f4d952397b48612c900a4033388b8bbc89827f34af140b113f9384bb4dea +MISC ChangeLog 1032 SHA256 18e372d7145e81e1f81ea85840929508ef82b23f102af85989e38812373368b5 WHIRLPOOL bc4bfd570967c37fce60f14c0132a747ace0397a1b8729a7bc6c9252ad31078d47f28002eb1246436c7daeebd649532751391c65ffcda6d54f3f682a89d2d8db MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae diff --git a/app-crypt/pvk/files/pvk-0.12-Makefile-rework.diff b/app-crypt/pvk/files/pvk-0.12-Makefile-rework.diff new file mode 100644 index 00000000..a2af9216 --- /dev/null +++ b/app-crypt/pvk/files/pvk-0.12-Makefile-rework.diff @@ -0,0 +1,81 @@ +--- Makefile 2013-08-21 00:35:26.024299153 +0200 ++++ Makefile 2013-08-21 01:06:19.256160856 +0200 +@@ -1,23 +1,64 @@ ++#!/usr/bin/make -f < + +-# Editable options +-TOP=$(HOME)/openssl +-SSLINC=/usr/local/ssl/include +-SSLLIB=/usr/local/ssl/lib ++NAME = pvk + +-CFLAGS=-Wall -I$(SSLINC) ++# Source files ++SRC = \ ++ pvk.c \ ++ pvkerr.c \ ++ pvkread.c \ ++ pvkwrite.c + +-all: pvk ++# Usefull programs ++PKG_CONFIG ?= pkg-config + +-OBJS=pvkread.o pvkwrite.o pvkerr.o ++CC ?= cc + +-$(OBJS): pvk.h ++INSTALL ?= install ++RM ?= rm -f + +-pvk: $(OBJS) pvk.o pvk.h +- $(CC) $(CFLAGS) -o pvk pvk.o $(OBJS) -L$(SSLLIB) -lcrypto ++# Installation destination ++DESTDIR = ++PREFIX = /usr/local ++BINDIR = $(PREFIX)/bin + +-errors: +- perl $(TOP)/util/mkerr.pl -nostatic -conf pvk.ec -write *.c ++# Compiler flags, if user environnement does not define them ++CFLAGS ?= \ ++ -W -Wall + +-clean: +- rm -f *.o pvk ++CRYPTO_CFLAGS ?= \ ++ $(shell sh -c '$(PKG_CONFIG) --cflags libcrypto') ++ ++CRYPTO_LDFLAGS ?= \ ++ $(shell sh -c '$(PKG_CONFIG) --libs libcrypto') ++ ++# Compiler flags to apply in any cases ++SPEC_CFLAGS = \ ++ $(CRYPTO_CFLAGS) ++ ++SPEC_LDFLAGS = \ ++ $(CRYPTO_LDFLAGS) ++ ++# Build pvk by default ++all: $(NAME) ++ ++# Compile rules ++$(NAME): $(SRC:c=o) ++ $(CC) -o $@ $^ $(SPEC_LDFLAGS) $(LDFLAGS) + ++$(NAME).o: $(NAME).c $(NAME).h ++ $(CC) -c $(SPEC_CFLAGS) $(CFLAGS) -o $@ $< ++ ++%.o: %.c ++ $(CC) -c $(SPEC_CFLAGS) $(CFLAGS) -o $@ $< ++ ++# Install rules ++install: $(DESTDIR)$(BINDIR)/$(NAME) ++ ++$(DESTDIR)$(BINDIR)/$(NAME): $(NAME) ++ $(INSTALL) -D -m 755 $< $@ ++ ++# Cleanup rules ++clean: ++ $(RM) $(SRC:c=o) ++ $(RM) $(NAME) diff --git a/app-crypt/pvk/pvk-0.12.ebuild b/app-crypt/pvk/pvk-0.12.ebuild index 7de1aec8..3e9faf62 100644 --- a/app-crypt/pvk/pvk-0.12.ebuild +++ b/app-crypt/pvk/pvk-0.12.ebuild @@ -3,41 +3,30 @@ # $Header: $ EAPI=5 -inherit toolchain-funcs +inherit eutils toolchain-funcs DESCRIPTION="Converts PVK files to PEM files and back again" HOMEPAGE="http://www.drh-consultancy.demon.co.uk/pvk.html" -SRC_URI="http://www.drh-consultancy.demon.co.uk/${PN}src.tgz.bin" +SRC_URI="http://www.drh-consultancy.demon.co.uk/${PN}src.tgz.bin -> ${P}.tgz" LICENSE="openssl" SLOT="0" KEYWORDS="~amd64" IUSE="" -DEPEND="dev-libs/openssl" +DEPEND="dev-libs/openssl:0" RDEPEND="${DEPEND}" S="${WORKDIR}" -src_unpack() { - tar xof "${DISTDIR}/${A}" || die "failure unpacking ${A}" -} - src_prepare() { - sed -i \ - -e '/^SSLINC=/d' \ - -e '/^SSLLIB=/d' \ - -e '/^CFLAGS=/d' \ - -e '/$(CC)/ s/-L$(SSLLIB)/$(LDFLAGS)/' \ - Makefile -} + epatch "${FILESDIR}/${P}-Makefile-rework.diff" -src_compile() { - emake CC="$(tc-getCC)" + tc-export CC } src_install() { - dobin pvk + emake install DESTDIR="${ED}" PREFIX="/usr" dodoc README } -- cgit v1.2.3