(non maintainer commit) migrate to EAPI=2, fix die messages, fix C(XX)FLAGS. Patch by Mounir Lamouri in bug 241034

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 32 insertions, 27 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/Manifest b/net-libs/osptoolkit/Manifest
index 076d652b63eb..421151f0f5c8 100644
--- a/net-libs/osptoolkit/Manifest
+++ b/net-libs/osptoolkit/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST OSPToolkit-3.3.4.tar.gz 411548 RMD160 edea882d926398b193868f48da17b19fce54396b SHA1 29e31729d7391dee7b2eca2317b3558e53e61cdc SHA256 66171b3cd725c5629f58a3111686d11ce038d3092d1e3b1858ebfe2620da514a
 DIST OSPToolkit-3.3.6.tar.gz 412164 RMD160 6bcb32758a7cb03e3dff5de49682092bb51ad23e SHA1 5921dc9bdd6c4f18c242086e817e1db19a2ac66a SHA256 332158e6b037e5b5c08ec8554e8d3834d917759b394412eb45d2c73b791d87ce
 EBUILD osptoolkit-3.3.4.ebuild 1446 RMD160 5e3025a93f2c2b111e870213713ff0206ae9d5df SHA1 13974790feb0fc145d0e85dbc81b41387afdab05 SHA256 f277ab694dcc1b5367fbec64ebb1ae55c405ac88909a6b00c0e7554a911773ad
-EBUILD osptoolkit-3.3.6.ebuild 1448 RMD160 0b37d85a01bd9e7892f17b5f9ef6cbfe54baa8c0 SHA1 09c789902eeed7e90190543c3e887ad566026b67 SHA256 e323c760b8fcd8cac5d4f307e3f1822dcefbf8920afd7c4078666ce141bee59a
-MISC ChangeLog 1209 RMD160 34d2a570cd47c033de8ce1032fe62eae08956c68 SHA1 c9ebbc335045543ac1370322083ee63abf513ccd SHA256 0f12f95e639b02ff933fb07fcb733ea02829eea68be44458d1d7e450ed3409dd
+EBUILD osptoolkit-3.3.6-r1.ebuild 1901 RMD160 ff94beafc8fb48843a3cf6370ce73a9b913f9aec SHA1 6618492b8e9fa4b0a7fc6b1ca909fc8930efd778 SHA256 eaf4fff074771b477d2b13fe7169329622f2a0911f9b59c6c8904f293f6b1374
+MISC ChangeLog 1476 RMD160 1461d8f0eda8ddf9c467ad0caf38dc2b832235c2 SHA1 e5d01cffaba89470c30af7ba271a726be90daf0b SHA256 f9e7e0f5b6b095a76f37e9fe8ef77305e0afa14c14693f6a29822e59b7855a94
 MISC metadata.xml 159 RMD160 1cb780cd4240aaeb1b22a09a786b8ed4b0803823 SHA1 c96c65dcb37a559953bf3446b6719b0cac3585a8 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkim93IACgkQV3J2n04EauwedACfQ9lBywqX9Fe93WU9s0B4v0zZ
-EyIAnAmRtFV5LU0sQrZEtSL5/exZgY4d
-=4cQb
------END PGP SIGNATURE-----
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() {