QA fixes, old

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 11 insertions, 77 deletions

diff --git a/media-libs/libkarma/files/libkarma-0.0.6-gentoo.patch b/media-libs/libkarma/files/libkarma-0.0.6-gentoo.patch
deleted file mode 100644
index 755b26c0e6b4..000000000000
--- a/media-libs/libkarma/files/libkarma-0.0.6-gentoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur libkarma-orig/Makefile libkarma/Makefile
---- libkarma-orig/Makefile	2007-02-28 01:39:36.000000000 -0100
-+++ libkarma/Makefile	2007-02-28 01:09:23.000000000 -0100
-@@ -13,7 +13,7 @@
- 	Jamfile Makefile COPYING ChangeLog THANKS INSTALL TODO \
- 	install-sh karma-tools.spec
- 
--all: libkarma tools karma-sharp
-+all: libkarma tools
- 
- install: libkarma tools karma-sharp
- 	cd $(LK_SRC) && $(MAKE) install
-@@ -31,9 +31,6 @@
- tools: FORCE
- 	cd $(TOOLSDIR) && $(MAKE)
- 
--karma-sharp: FORCE
--	cd karma-sharp && $(MAKE)
--
- dist: 
- 	mkdir -p $(DISTNAME)
- 	mkdir -p $(DISTNAME)/$(LK_SRC)
diff --git a/media-libs/libkarma/files/libkarma-0.0.6-soname.patch b/media-libs/libkarma/files/libkarma-0.0.6-soname.patch
deleted file mode 100644
index f8e3ecd986cb..000000000000
--- a/media-libs/libkarma/files/libkarma-0.0.6-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libkarma-orig/src/Makefile	2007-02-28 01:39:45.000000000 -0100
-+++ libkarma/src/Makefile	2007-03-09 20:55:13.000000000 -0100
-@@ -40,7 +40,7 @@
- 	$(RANLIB) $(LIBDIR)/$(TARGET).a
- 
- shared: $(OBJS) $(LIBDIR)
--	$(CC) -shared $(OBJS) $(CFLAGS) -o $(LIBDIR)/$(TARGET).so -ltag_c
-+	$(CC) -shared $(OBJS) $(CFLAGS) -o $(LIBDIR)/$(TARGET).so -ltag_c -Wl,-soname,$(NAME)-$(VERSION)
- 
- all: $(TARGET) shared
- 
diff --git a/media-libs/libkarma/libkarma-0.0.6-r1.ebuild b/media-libs/libkarma/libkarma-0.0.6-r1.ebuild
deleted file mode 100644
index 37ea3efcce14..000000000000
--- a/media-libs/libkarma/libkarma-0.0.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkarma/libkarma-0.0.6-r1.ebuild,v 1.1 2007/03/09 23:41:04 masterdriverz Exp $
-
-inherit eutils mono
-
-DESCRIPTION="Support library for using Rio devices with mtp"
-HOMEPAGE="http://www.freakysoft.de/html/libkarma/"
-SRC_URI="http://www.freakysoft.de/html/libkarma/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="mono"
-
-DEPEND="virtual/libiconv
-	media-libs/taglib
-	mono? ( dev-lang/mono )
-	dev-libs/libusb"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use !mono && epatch "${FILESDIR}/${P}-mono.patch"
-	epatch "${FILESDIR}/${P}-soname.patch"
-}
-
-src_compile() {
-	# need "all" target to build both static and shared libs
-	emake -j1 all || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install PREFIX="${D}/usr" || die "emake install failed"
-}
diff --git a/media-libs/libkarma/libkarma-0.1.0.ebuild b/media-libs/libkarma/libkarma-0.1.0.ebuild
index 0cc7e482804d..80af7e43c392 100644
--- a/media-libs/libkarma/libkarma-0.1.0.ebuild
+++ b/media-libs/libkarma/libkarma-0.1.0.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkarma/libkarma-0.1.0.ebuild,v 1.6 2008/06/22 16:40:42 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkarma/libkarma-0.1.0.ebuild,v 1.7 2009/05/12 09:55:02 ssuominen Exp $
 
+EAPI=2
 inherit eutils mono multilib
 
 DESCRIPTION="Support library for using Rio devices with mtp"
@@ -13,23 +14,24 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="mono"
 
-DEPEND="virtual/libiconv
+RDEPEND="virtual/libiconv
 	media-libs/taglib
 	mono? ( dev-lang/mono )
 	dev-libs/libusb"
+DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use !mono && epatch "${FILESDIR}/libkarma-0.0.6-mono.patch"
-	epatch "${FILESDIR}/${P}-multilib.patch"
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	use mono || epatch "${FILESDIR}"/libkarma-0.0.6-mono.patch
+	epatch "${FILESDIR}"/${P}-multilib.patch
 }
 
 src_compile() {
-	emake -j1 all || die "emake failed"
+	emake all || die "emake failed"
 }
 
 src_install() {
 	export _LIBDIR=$(get_libdir)
-	emake -j1 PREFIX="${D}/usr" install || die "emake install failed"
+	emake PREFIX="${D}/usr" install || die "emake install failed"
 }