diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2007-09-26 09:05:02 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2007-09-26 09:05:02 +0000 |
| commit | f53a8665a48177df7fb8ca062cdbe102e30a0d14 (patch) | |
| tree | cf7b68365ae2a97172fbfbbc4b603c637affa27c /net-misc/openswan | |
| parent | Use emake on install. Stop adding /usr/share/X11/xkb to CONFIG_PROTECT becaus... (diff) | |
| download | historical-f53a8665a48177df7fb8ca062cdbe102e30a0d14.tar.gz historical-f53a8665a48177df7fb8ca062cdbe102e30a0d14.tar.bz2 historical-f53a8665a48177df7fb8ca062cdbe102e30a0d14.zip | |
improve get_make_options(); use $KERNEL_DIR
Package-Manager: portage-2.1.2.12
Diffstat (limited to 'net-misc/openswan')
| -rw-r--r-- | net-misc/openswan/Manifest | 14 | ||||
| -rw-r--r-- | net-misc/openswan/openswan-2.4.9-r1.ebuild | 30 |
2 files changed, 21 insertions, 23 deletions
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest index 61234f28a714..79d35ffa1e75 100644 --- a/net-misc/openswan/Manifest +++ b/net-misc/openswan/Manifest @@ -40,10 +40,10 @@ EBUILD openswan-2.4.8.ebuild 2989 RMD160 8dc0553397425b995772f5e93bd41476c2a0efd MD5 2096ef1777f53a08f1285bb438bb8e4e openswan-2.4.8.ebuild 2989 RMD160 8dc0553397425b995772f5e93bd41476c2a0efdd openswan-2.4.8.ebuild 2989 SHA256 bfbb85668e33354e84d1b211b2a594c4de62d8884a7bef5c42eda5bfeb14e2f4 openswan-2.4.8.ebuild 2989 -EBUILD openswan-2.4.9-r1.ebuild 3550 RMD160 df11ad7c61da20ceaf69f18eb8525e377f90718c SHA1 8f9044a292de9d4ff5cc4f36c3cc069b3421209b SHA256 9a9a0897955c162070925b88323b1ccb568d0d5c59e2bb9483c51f66b3a26f04 -MD5 2ecf76d98672010668ca0fedeb034042 openswan-2.4.9-r1.ebuild 3550 -RMD160 df11ad7c61da20ceaf69f18eb8525e377f90718c openswan-2.4.9-r1.ebuild 3550 -SHA256 9a9a0897955c162070925b88323b1ccb568d0d5c59e2bb9483c51f66b3a26f04 openswan-2.4.9-r1.ebuild 3550 +EBUILD openswan-2.4.9-r1.ebuild 3430 RMD160 f89e230fd80e1327faa10665c7d4cd5324475340 SHA1 36bb197dbbada5e36c6580cdbb170fcaebd85f0c SHA256 279eb6a66dec94bcbb85559bfc44c79b693e9c394ee6fe31aae71f51f520dbd3 +MD5 bfbab5c004dd5af68a7c5c4469961429 openswan-2.4.9-r1.ebuild 3430 +RMD160 f89e230fd80e1327faa10665c7d4cd5324475340 openswan-2.4.9-r1.ebuild 3430 +SHA256 279eb6a66dec94bcbb85559bfc44c79b693e9c394ee6fe31aae71f51f520dbd3 openswan-2.4.9-r1.ebuild 3430 MISC ChangeLog 7265 RMD160 ca0db318f85c3cb4905684d2672315a6e45e528a SHA1 3d1a11730ef7fa6373b4e059aa8e95a31ca19667 SHA256 48e57f99159b061d466c59952ff75fb446ffe5ff5aa31844fec11f4230e7c10f MD5 f86e3cdd2808e540f4921f65eb6b128f ChangeLog 7265 RMD160 ca0db318f85c3cb4905684d2672315a6e45e528a ChangeLog 7265 @@ -64,7 +64,7 @@ SHA256 2bdec402bca1cb5ac0037551f31fa6192553f361d03842c63665f484642bd805 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.5 (GNU/Linux) -iD8DBQFG+hTrVSA5X31g7/gRAnrKAKCQ/j/tY56PTz7DE5NGrKrPjc9sVgCaAwyn -q7ESuyNsIuKFOuUTEPGeNSQ= -=FKes +iD8DBQFG+iDGVSA5X31g7/gRAiDIAJ9gBT7+XF8Fn7bzNcpgSof3VnlYBACgjk46 +jH5dnFd0M1+TarxAOJjiLTo= +=OeEn -----END PGP SIGNATURE----- diff --git a/net-misc/openswan/openswan-2.4.9-r1.ebuild b/net-misc/openswan/openswan-2.4.9-r1.ebuild index c76bd6646c51..fbdb6b485ee8 100644 --- a/net-misc/openswan/openswan-2.4.9-r1.ebuild +++ b/net-misc/openswan/openswan-2.4.9-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.9-r1.ebuild,v 1.1 2007/09/26 08:14:22 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.9-r1.ebuild,v 1.2 2007/09/26 09:05:02 mrness Exp $ inherit eutils linux-info @@ -31,7 +31,7 @@ pkg_setup() { MYMAKE="programs" elif kernel_is 2 4; then - if ! [ -d /usr/src/linux/net/ipsec ]; then + if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then eerror "You need to have an IPsec enabled 2.4.x kernel." eerror "Ensure you have one running and make a symlink to it in /usr/src/linux" die @@ -55,37 +55,35 @@ src_unpack() { } get_make_options() { - local MY_MAKE_OPTIONS="FINALCONFDIR=/etc/ipsec \ + echo KERNELSRC=\"${KERNEL_DIR}\" \ + FINALCONFDIR=/etc/ipsec \ INC_RCDEFAULT=/etc/init.d \ INC_USRLOCAL=/usr \ INC_MANDIR=share/man \ FINALEXAMPLECONFDIR=/usr/share/doc/${P} \ - FINALDOCDIR=/usr/share/doc/${P}" + FINALDOCDIR=/usr/share/doc/${P} \ + DESTDIR=\"${D}\" \ + USERCOMPILE=\"${CFLAGS}\" if use smartcard ; then - MY_MAKE_OPTIONS="${MY_MAKE_OPTIONS} USE_SMARTCARD=true" + echo USE_SMARTCARD=true fi if use extra-algorithms ; then - MY_MAKE_OPTIONS="${MY_MAKE_OPTIONS} USE_EXTRACRYPTO=true" + echo USE_EXTRACRYPTO=true fi if use weak-algorithms ; then - MY_MAKE_OPTIONS="${MY_MAKE_OPTIONS} USE_WEAKSTUFF=true" + echo USE_WEAKSTUFF=true fi - echo ${MY_MAKE_OPTIONS} } src_compile() { - emake \ - DESTDIR="${D}" \ - USERCOMPILE="${CFLAGS}" \ - $(get_make_options) \ + eval set -- $(get_make_options) + emake "$@" \ ${MYMAKE} || die "emake failed" } src_install() { - emake \ - DESTDIR="${D}" \ - USERCOMPILE="${CFLAGS}" \ - $(get_make_options) \ + eval set -- $(get_make_options) + emake "$@" \ install || die "emake install failed" dosym /etc/ipsec/ipsec.d /etc/ipsec.d |