clean up ugly ugly ebuild

1 files changed, 15 insertions, 19 deletions

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
 }