summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2009-02-17 05:08:42 +0000
committerJeremy Olexa <darkside@gentoo.org>2009-02-17 05:08:42 +0000
commit910ba79d62383a142a62f9b6a184102fa26d67b2 (patch)
tree7c71968ccd90b6b5755ddcf782e2d99818b5c9f1 /net-libs
parentneeds USE=joystick for libsdl (bug #259308) (diff)
downloadgentoo-2-910ba79d62383a142a62f9b6a184102fa26d67b2.tar.gz
gentoo-2-910ba79d62383a142a62f9b6a184102fa26d67b2.tar.bz2
gentoo-2-910ba79d62383a142a62f9b6a184102fa26d67b2.zip
(non maintainer commit) migrate to EAPI=2, fix die messages, fix C(XX)FLAGS. Patch by Mounir Lamouri in bug 241034
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/osptoolkit/ChangeLog11
-rw-r--r--net-libs/osptoolkit/osptoolkit-3.3.6-r1.ebuild (renamed from net-libs/osptoolkit/osptoolkit-3.3.6.ebuild)34
2 files changed, 30 insertions, 15 deletions
diff --git a/net-libs/osptoolkit/ChangeLog b/net-libs/osptoolkit/ChangeLog
index 330a75c4cc46..dc325b5e8372 100644
--- a/net-libs/osptoolkit/ChangeLog
+++ b/net-libs/osptoolkit/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-libs/osptoolkit
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/ChangeLog,v 1.8 2008/08/16 15:39:32 tove Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/ChangeLog,v 1.9 2009/02/17 05:08:42 darkside Exp $
+
+*osptoolkit-3.3.6-r1 (17 Feb 2009)
+
+ 17 Feb 2009; Jeremy Olexa <darkside@gentoo.org> -osptoolkit-3.3.6.ebuild,
+ +osptoolkit-3.3.6-r1.ebuild:
+ (non maintainer commit) migrate to EAPI=2, fix die messages, fix C(XX)FLAGS.
+ Patch by Mounir Lamouri in bug 241034
16 Aug 2008; Torsten Veller <tove@gentoo.org> metadata.xml:
Remove stkn from metadata.xml (#27693)
diff --git a/net-libs/osptoolkit/osptoolkit-3.3.6.ebuild b/net-libs/osptoolkit/osptoolkit-3.3.6-r1.ebuild
index 5020976dcd5c..51b59fa44bea 100644
--- a/net-libs/osptoolkit/osptoolkit-3.3.6.ebuild
+++ b/net-libs/osptoolkit/osptoolkit-3.3.6-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/osptoolkit-3.3.6.ebuild,v 1.1 2007/05/01 09:25:40 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/osptoolkit-3.3.6-r1.ebuild,v 1.1 2009/02/17 05:08:42 darkside Exp $
+
+EAPI="2"
inherit eutils
@@ -19,12 +21,18 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}"/TK-${PV//./_}-20060303
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
+src_prepare() {
+ # change lib dir to $(LIBDIR)
+ # and use users CFLAGS, see bug #241034
sed -i -e "s:\$(INSTALL_PATH)/lib:\$(INSTALL_PATH)/\$(LIBDIR):" \
- src/Makefile
+ -e "s:CFLAGS\t= -O:CFLAGS\t+= :" \
+ src/Makefile || die "patching src/Makefile failed"
+
+ sed -i -e "/CFLAGS /d" enroll/Makefile \
+ || die "patching enroll/Makefile failed"
+
+ sed -i -e "s/CFLAGS = -g/CFLAGS +=/" test/Makefile \
+ || die "patching test/Makefile failed"
}
src_compile() {
@@ -36,20 +44,20 @@ src_compile() {
src_install() {
dodir /usr/include /usr/$(get_libdir)
- make -C src INSTALL_PATH="${D}"/usr LIBDIR=$(get_libdir) \
+ emake -C src INSTALL_PATH="${D}"/usr LIBDIR=$(get_libdir) \
install || die "make install failed"
sed -i -e "s:^\(OPENSSL_CONF\).*:\1=/etc/ssl/openssl.cnf:" \
-e "s:^\(RANDFILE\).*:\1=/etc/ssl/.rnd:" \
- bin/enroll.sh
+ bin/enroll.sh || die "patching bin/enroll.sh failed"
- dosbin bin/enroll*
- newbin bin/test_app osp_test_app
+ dosbin bin/enroll* || die "dosbin failed"
+ newbin bin/test_app osp_test_app || die "newbin failed"
- dodoc *.txt
+ dodoc *.txt || die "dodoc failed"
insinto /usr/share/doc/${PF}
- doins bin/test.cfg
+ doins bin/test.cfg || die "doins failed"
}
pkg_postinst() {