From 23ca4f29394587fe89aacc344250a4329772eac8 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 17 Nov 2004 16:36:21 +0000
Subject: [PATCH] clean up ugly ugly ebuild

---
 app-admin/osiris/Manifest            | 12 +++++++++-
 app-admin/osiris/osiris-1.5.2.ebuild | 34 ++++++++++++----------------
 app-admin/procman/Manifest           | 16 +++++++++----
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/app-admin/osiris/Manifest b/app-admin/osiris/Manifest
index 2a51c8634df4..3b98b46e9f30 100644
--- a/app-admin/osiris/Manifest
+++ b/app-admin/osiris/Manifest
@@ -1,3 +1,13 @@
-MD5 8efb2824fe20eb45fa62a2b1c1c42bae osiris-1.5.2.ebuild 1310
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 bc4c30af0a4858ec06bc0c6f0b4414c7 ChangeLog 931
+MD5 8b663fb2d942503c929a7d57a87ca7bf osiris-1.5.2.ebuild 1213
 MD5 6f6df8ce6e4231c6c1c4ceeca6efafa4 files/digest-osiris-1.5.2 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBm342HTu7gpaalycRAj7+AKDPOPb9Cd7apQSqSuyQPCtPCzurwwCdFZy/
+jqjAmse8Wo8Ax1VCXxCSGp4=
+=+7j/
+-----END PGP SIGNATURE-----
diff --git a/app-admin/osiris/osiris-1.5.2.ebuild b/app-admin/osiris/osiris-1.5.2.ebuild
index 4ebff26885d8..1d585e3c255f 100644
--- a/app-admin/osiris/osiris-1.5.2.ebuild
+++ b/app-admin/osiris/osiris-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/osiris-1.5.2.ebuild,v 1.7 2004/06/24 21:33:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/osiris-1.5.2.ebuild,v 1.8 2004/11/17 16:36:21 vapier Exp $
 
 DESCRIPTION="File integrity verification system"
 HOMEPAGE="http://osiris.shmoo.com/"
@@ -8,39 +8,35 @@ SRC_URI="http://osiris.shmoo.com/data/${P}.tar.gz"
 
 LICENSE="OSIRIS"
 SLOT="0"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86"
 IUSE="mysql"
 
 DEPEND="mysql? ( >=dev-db/mysql-3.23.54a )"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i \
+		-e "s:-O3 -fomit-frame-pointer:${CFLAGS}:" \
+		src/crypto/*/Makefile || die "sed"
+}
 
+src_compile() {
 	# Osiris provides the necessary gdbm source so that gdbm does not
 	# need to be installed to use Osiris. If mysql is set as a USE
 	# variable, Osiris will use mysql instead of gdbm.
-
 	einfo "Osiris uses gdbm by default, and will use MySQL if \"mysql\""
 	einfo "is set as a USE variable; it cannot be configured to use both."
 
 	local myconf
-	use mysql && myconf="${myconf} --enable-module=mysql"
-
-	# The mysql module searches for the mysql.h file in the wrong place
-	# sed line replaces it with the proper path (mysql/mysql.h)
-
-	use mysql && sed -i -e "s:mysql.h:mysql/mysql.h:" \
-				${S}/src/modules/module_mysql.c
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} || die "./configure failed"
+	use mysql \
+		&& myconf="${myconf} --enable-module=mysql" \
+		&& sed -i -e "s:mysql.h:mysql/mysql.h:" ${S}/src/modules/module_mysql.c
+	econf ${myconf} || die "./configure failed"
 
 	emake || die "emake failed"
 }
 
 src_install() {
-	einstall
+	make install DESTDIR="${D}" || die
 }
diff --git a/app-admin/procman/Manifest b/app-admin/procman/Manifest
index 9b914ea910c2..e80e9a11e4a8 100644
--- a/app-admin/procman/Manifest
+++ b/app-admin/procman/Manifest
@@ -1,5 +1,13 @@
-MD5 da4e2b0d149a3b1d4e32fbaccbf2d0b5 procman-0.99.0.ebuild 816
-MD5 41b6c35f4a79d0fcb12fb68653879b63 procman-1.0.ebuild 803
-MD5 81558923be7a90f49b0f5d00ec1d7b2b ChangeLog 1210
-MD5 642d64aec8f88f31cbb96ec000c09529 files/digest-procman-0.99.0 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0a9a902ba0988efb43e3c310fba35ae2 ChangeLog 1333
+MD5 dcf17e4211318e7157d9adfac6d52244 procman-1.0.ebuild 808
 MD5 4e43867867179e603fbf302b06e33d0d files/digest-procman-1.0 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBm38JHTu7gpaalycRAo4WAKCgvlDB+1hsynimKzz9m9zPIhWGiQCbB9vG
+dIL7o3oqBdywxOWXHFMifuM=
+=8jeL
+-----END PGP SIGNATURE-----
-- 
2.26.2