diff options
author | Seemant Kulleen <seemant@gentoo.org> | 2005-06-06 13:44:47 +0000 |
---|---|---|
committer | Seemant Kulleen <seemant@gentoo.org> | 2005-06-06 13:44:47 +0000 |
commit | 4099352c055df7acaf366ce36ee89e5fda9aafa3 (patch) | |
tree | 38565aff660ebf0db23049e80179bcacb6f0f515 /app-crypt/mit-krb5 | |
parent | change change all in vain (diff) | |
download | gentoo-2-4099352c055df7acaf366ce36ee89e5fda9aafa3.tar.gz gentoo-2-4099352c055df7acaf366ce36ee89e5fda9aafa3.tar.bz2 gentoo-2-4099352c055df7acaf366ce36ee89e5fda9aafa3.zip |
ok, just install to regular locations -- no more custom location stuff -- at least, not for now
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'app-crypt/mit-krb5')
-rw-r--r-- | app-crypt/mit-krb5/files/mit-krb5-1.4-lazyldflags.patch | 19 | ||||
-rw-r--r-- | app-crypt/mit-krb5/mit-krb5-1.4.ebuild | 45 |
2 files changed, 35 insertions, 29 deletions
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.4-lazyldflags.patch b/app-crypt/mit-krb5/files/mit-krb5-1.4-lazyldflags.patch new file mode 100644 index 000000000000..ad2adc1dd0dc --- /dev/null +++ b/app-crypt/mit-krb5/files/mit-krb5-1.4-lazyldflags.patch @@ -0,0 +1,19 @@ +--- krb5-1.4/src/clients/ksu/Makefile.in.orig 2004-04-29 18:51:10.000000000 -0400 ++++ krb5-1.4/src/clients/ksu/Makefile.in 2005-04-28 16:51:37.000000000 -0400 +@@ -8,6 +8,7 @@ + PROG_RPATH=$(KRB5_LIBDIR) + + KSU_LIBS=@KSU_LIBS@ ++LAZY_LDFLAGS=-Wl,-z,now + + SRCS = \ + $(srcdir)/krb_auth_su.c \ +@@ -28,7 +29,7 @@ + all:: ksu + + ksu: $(OBJS) $(KRB5_BASE_DEPLIBS) +- $(CC_LINK) -o $@ $(OBJS) $(KRB5_BASE_LIBS) $(KSU_LIBS) ++ $(CC_LINK) -o $@ $(OBJS) $(KRB5_BASE_LIBS) $(KSU_LIBS) $(LAZY_LDFLAGS) + + clean:: + $(RM) ksu diff --git a/app-crypt/mit-krb5/mit-krb5-1.4.ebuild b/app-crypt/mit-krb5/mit-krb5-1.4.ebuild index ae12d509a0a5..b3a06ce068ee 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.4.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.4.ebuild,v 1.4 2005/04/08 20:41:17 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.4.ebuild,v 1.5 2005/06/06 13:44:47 seemant Exp $ inherit eutils flag-o-matic versionator @@ -16,8 +16,8 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="krb4 static tcltk ipv6 doc tetex" -RDEPEND="virtual/libc" -# !virtual/krb5" +RDEPEND="virtual/libc + !virtual/krb5" DEPEND="${RDEPEND} sys-libs/com_err @@ -27,8 +27,9 @@ DEPEND="${RDEPEND} PROVIDE="virtual/krb5" src_unpack() { - unpack ${A}; tar -zxf ${MY_P}.tar.gz; cd ${S} + unpack ${A}; tar zxf ${MY_P}.tar.gz; cd ${S} epatch ${FILESDIR}/${P}-2005-001.patch + epatch ${FILESDIR}/${P}-lazyldflags.patch } src_compile() { @@ -36,34 +37,24 @@ src_compile() { export DB_LIB="/usr/$(get_libdir)/libdb.so" econf \ - $(use_enable static) \ $(use_with krb4) \ - $(use_enable ipv6) \ $(use_with tcltk tcl) \ + $(use_enable ipv6) \ + $(use_enable static) \ --enable-shared \ --with-system-et --with-system-ss --with-system-db \ --enable-dns-for-realm \ - --program-prefix=mit- \ - --sysconfdir=/etc/kerberos \ - --libdir=/usr/$(get_libdir)/kerberos/mit \ - --includedir=/usr/include/kerberos/mit || die - - emake || die + || die - # Now, remake the ksu binary with -Wl,-z,now in CFLAGS - append-ldflags "-Wl,-z,now" - emake -C clients/ksu clean || die - emake LDFLAGS="${LDFLAGS}" -C clients/ksu || die + MAKEOPTS=-j1 emake || die - if use doc - then + if use doc ; then cd ../doc rm man2html && ln -sf ${ROOT}/usr/bin/man2html make || die - if use tetex - then + if use tetex ; then cd api make || die fi @@ -76,13 +67,6 @@ src_install() { EXAMPLEDIR=/usr/share/doc/${PF}/examples \ install || die - # Fix remaining namespace issues - mv ${D}/usr/bin/{,mit-}krb5-config - mv ${D}/usr/sbin/{,mit-}kadmin - mv ${D}/usr/sbin/{,mit-}kadmind - mv ${D}/usr/sbin/{,mit-}ktutil - - cd .. dodoc README doinfo doc/*.texinfo @@ -91,13 +75,16 @@ src_install() { then dohtml -r doc use tetex \ - && dodoc doc/api/*.ps \ - || dodoc doc/api/*.{tex,sty} + && dodoc doc/api/*.{tex,sty} \ + || dodoc doc/api/*.ps fi newinitd ${FILESDIR}/mit-krb5kadmind.initd mit-krb5kadmind newinitd ${FILESDIR}/mit-krb5kdc.initd mit-krb5kdc + + insinto /etc + doins ${FILESDIR}/k{rb5,dc}.conf } pkg_postinst() { |