Fix pkgconfig file wrt #245539 by using DESTDIR as it should.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 206 insertions, 7 deletions

diff --git a/media-libs/libkarma/ChangeLog b/media-libs/libkarma/ChangeLog
index 690c29d2b01c..ef3b3efe01c2 100644
--- a/media-libs/libkarma/ChangeLog
+++ b/media-libs/libkarma/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libkarma
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkarma/ChangeLog,v 1.11 2008/06/22 16:40:42 gentoofan23 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkarma/ChangeLog,v 1.12 2009/05/12 11:08:48 ssuominen Exp $
+
+*libkarma-0.1.0-r1 (12 May 2009)
+
+  12 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +libkarma-0.1.0-r1.ebuild, +files/libkarma-0.1.0-destdir.patch:
+  Fix pkgconfig file wrt #245539 by using DESTDIR as it should.
 
   22 Jun 2008; Thomas Anderson <gentoofan23@gentoo.org>
   libkarma-0.1.0.ebuild:
diff --git a/media-libs/libkarma/Manifest b/media-libs/libkarma/Manifest
index 6c4202357011..8fc71dd457bd 100644
--- a/media-libs/libkarma/Manifest
+++ b/media-libs/libkarma/Manifest
@@ -1,6 +1,8 @@
 AUX libkarma-0.0.6-mono.patch 583 RMD160 b5019f17f39ae5c353f0dd938bd7645894c5f68a SHA1 35fe837d84f79d0653ba9e0caa137fa35409abcd SHA256 f18be831649bd3f554b92c81a3774b2c160f814714e42d0129723c925e22923d
+AUX libkarma-0.1.0-destdir.patch 5603 RMD160 87eece8a1006fd14c574a36e53122022a5218905 SHA1 3dc809b3fa484e150e2fe40cf4d7d29dd8ef2ac2 SHA256 de59298f780439e88ebbd4ea66cdf4c43a673e586fc6078986707d18865be462
 AUX libkarma-0.1.0-multilib.patch 1559 RMD160 fe38e092df4b6bf5e8237bbcca538a7b27cb0ce5 SHA1 0626e4e20db1dfa80cf30ef2fb7e92c013d5f5ee SHA256 0c39caad3627c1f7cb074790ff78096c66a3db95d1724b8b3f76a0bb80b63e4f
 DIST libkarma-0.1.0.tar.gz 79137 RMD160 d992f77f0ca419bf3f87a5258623bb1e93fe54d5 SHA1 44f73f3e61b41eb14d42108863865bce7df3eeb0 SHA256 eb5d4e8468c92d480f469cd467a7d9a3ee51a76d7f217c0d34e9c7a503984523
-EBUILD libkarma-0.1.0.ebuild 928 RMD160 1f769707239d40517aa4b2261592ecdb9d5cf599 SHA1 8dbab3809e2d127259f5924e826bac4f699c8305 SHA256 39bca0947f66af769df2059c970151bf2f050ae71a814113ad2eed4de7f14746
-MISC ChangeLog 1757 RMD160 4b11ea3233decd232c0f8efcd63fcad9379e70e1 SHA1 cb2da1794a499e73328cf5790eb66b8f1cba8e20 SHA256 82c6a7d5507dffbe28641b2215c44f8721910b7285e0642599d7b62bde88f2c0
+EBUILD libkarma-0.1.0-r1.ebuild 892 RMD160 72958ef009b3a37e7405c48937f0c3e567b2c088 SHA1 e57e2f1906af1138241554b41b8ce62d0b3e5b18 SHA256 cb66ca44f95abad1fa4e8ee3c8de5bb074b29529faa8bb96117a70e336782511
+EBUILD libkarma-0.1.0.ebuild 968 RMD160 63d034d730f0c619bbaacfef051e59876beaaf54 SHA1 38ac6d8b4769fcbdf4083529c6d60928c1feb693 SHA256 8684cd1c45365b51f29e95f6668559410c8ca320e1b42768abcb5ad47cfa03e5
+MISC ChangeLog 1974 RMD160 b350a702c57d7e4584a54bb404b1a1eda9d74977 SHA1 92a4b18ccaccf5aee2ac56157b2ecaadf7adeed9 SHA256 5399329fd5470e8754d0afcba8ef38bccc4791c4e4f65aa7ca9073de7113237e
 MISC metadata.xml 175 RMD160 8217c4a76a964b25b18eb6446b5364cf64b138a8 SHA1 8ae12528d1d4edb7a19134a659e8e7e8027fdec8 SHA256 2f35f6077ef4ecfad27847015b45c84c02488fb5a80413e5537e28b410141053
diff --git a/media-libs/libkarma/files/libkarma-0.1.0-destdir.patch b/media-libs/libkarma/files/libkarma-0.1.0-destdir.patch
new file mode 100644
index 000000000000..9ff4bfa2a5ea
--- /dev/null
+++ b/media-libs/libkarma/files/libkarma-0.1.0-destdir.patch
@@ -0,0 +1,152 @@
+diff -ur libkarma-0.1.0.orig/karma-sharp/Makefile libkarma-0.1.0/karma-sharp/Makefile
+--- libkarma-0.1.0.orig/karma-sharp/Makefile	2007-05-15 19:29:02.000000000 +0300
++++ libkarma-0.1.0/karma-sharp/Makefile	2009-05-12 13:58:55.000000000 +0300
+@@ -26,18 +26,18 @@
+ 
+ ifdef HAS_MONO
+ install: $(ASSEMBLY) karma-sharp.pc
+-	../install-sh -d $(DEST)/lib/karma-sharp
+-	../install-sh -d $(DEST)/lib/pkgconfig
+-	../install-sh -t $(DEST)/lib/karma-sharp $(ASSEMBLY)
+-	../install-sh -t $(DEST)/lib/pkgconfig -m 0644 karma-sharp.pc
++	../install-sh -d $(DESTDIR)$(PREFIX)/lib/karma-sharp
++	../install-sh -d $(DESTDIR)$(PREFIX)/lib/pkgconfig
++	../install-sh -t $(DESTDIR)$(PREFIX)/lib/karma-sharp $(ASSEMBLY)
++	../install-sh -t $(DESTDIR)$(PREFIX)/lib/pkgconfig -m 0644 karma-sharp.pc
+ else
+ install:
+ 
+ endif
+ 
+ uninstall: FORCE
+-	$(RM) -r $(DEST)/lib/karma-sharp
+-	$(RM) $(DEST)/lib/pkgconfig/karma-sharp.pc
++	$(RM) -r $(PREFIX)/lib/karma-sharp
++	$(RM) $(PREFIX)/lib/pkgconfig/karma-sharp.pc
+ 
+ $(ASSEMBLY): $(ASSEMBLY_SOURCES) $(ASSEMBLY_RESOURCES)
+ 	$(MCS) $(MCS_FLAGS) -unsafe -target:library -out:$@ $(ASSEMBLY_SOURCES) $(ASSEMBLY_RESOURCES:%=-resource:%) -r:Mono.Posix
+diff -ur libkarma-0.1.0.orig/Makefile libkarma-0.1.0/Makefile
+--- libkarma-0.1.0.orig/Makefile	2007-05-15 19:29:02.000000000 +0300
++++ libkarma-0.1.0/Makefile	2009-05-12 13:57:16.000000000 +0300
+@@ -1,14 +1,12 @@
+ LK_SRC=src
+ TOOLSDIR=tools
+-PREFIX=/usr/local
++PREFIX=/usr
+ INSTALL?=./install-sh
+ VERSION=0.1.0
+-DEST=$(PREFIX)
+ SHELL=/bin/bash
+ 
+ export PREFIX
+ export VERSION
+-export DEST
+ 
+ DISTNAME=libkarma-$(VERSION)
+ DISTFILES= $(LK_SRC)/{Jamfile,Makefile,*[ch]} \
+@@ -16,11 +14,10 @@
+ 	karma-sharp/{Makefile,karma-sharp.pc.in,Song.cs,Device.cs} \
+ 	Jamfile Makefile COPYING ChangeLog THANKS INSTALL* TODO \
+ 	install-sh karma-tools.spec
+-DOCS=THANKS TODO ChangeLog
+ 
+ INSTALL_DIR     := $(INSTALL) -d -o root -g root -m 0755
+ INSTALL_FILE    := $(INSTALL)    -o root -g root -m 0644
+-INSTALL_PROGRAM := $(INSTALL)    -o root -g root -m 0755 # -s
++INSTALL_PROGRAM := $(INSTALL)    -o root -g root -m 0755
+ INSTALL_SCRIPT  := $(INSTALL)    -o root -g root -m 0755
+ 
+ all: libkarma tools karma-sharp
+@@ -31,14 +28,11 @@
+ 	cd $(LK_SRC) && $(MAKE) install
+ 	cd karma-sharp && $(MAKE) install
+ 	cd tools && $(MAKE) install
+-	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/doc/libkarma
+-	$(INSTALL_FILE) $(DOCS) $(DESTDIR)$(PREFIX)/share/doc/libkarma
+ 
+ uninstall: 
+ 	cd $(LK_SRC) && $(MAKE) uninstall
+ 	cd karma-sharp && $(MAKE) uninstall
+ 	cd tools && $(MAKE) uninstall
+-	rm -rf $(DESTDIR)$(PREFIX)/share/doc/libkarma
+ 
+ libkarma: FORCE
+ 	cd $(LK_SRC) && $(MAKE)
+diff -ur libkarma-0.1.0.orig/src/Makefile libkarma-0.1.0/src/Makefile
+--- libkarma-0.1.0.orig/src/Makefile	2007-05-15 19:29:02.000000000 +0300
++++ libkarma-0.1.0/src/Makefile	2009-05-12 14:06:24.000000000 +0300
+@@ -14,7 +14,7 @@
+ LN_S?=ln -s
+ 
+ CFLAGS+=-fPIC -D_REENTRANT -Wall -pedantic
+-CFLAGS+=-ggdb -W -Wchar-subscripts -Wmissing-prototypes 
++CFLAGS+=-W -Wchar-subscripts -Wmissing-prototypes 
+ CFLAGS+=-Wmissing-declarations -Wno-switch -Wredundant-decls -Wno-unused
+ 
+ MAJOR?=$(shell VERSION=${VERSION} echo $${VERSION%%\.*})
+@@ -37,20 +37,20 @@
+ default: all
+ 
+ install: shared-lib-stamp static-lib-stamp
+-	../install-sh -m 0755 -d $(DEST)/lib
+-	../install-sh -m 0755 -d $(DEST)/include
+-	../install-sh -m 0755 -d $(DEST)/include/libkarma
+-	../install-sh -m 0644 -t $(DEST)/lib/ $(LIBDIR)/$(TARGET).a
+-	../install-sh -m 0755 -t $(PREFIX)/lib/ $(LIBDIR)/$(OUT_VERSION)
+-	$(RM) $(PREFIX)/lib/$(OUT_MAJOR)
+-	$(RM) $(PREFIX)/lib/$(OUT_BASE)
+-	$(LN_S) $(OUT_VERSION) $(PREFIX)/lib/$(OUT_MAJOR)
+-	$(LN_S) $(OUT_VERSION) $(PREFIX)/lib/$(OUT_BASE)
+-	../install-sh -m 0644 -t $(DEST)/include/libkarma/ $(INST_HEADERS)
++	../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/lib
++	../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/include
++	../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/include/libkarma
++	../install-sh -m 0644 -t $(DESTDIR)$(PREFIX)/lib/ $(LIBDIR)/$(TARGET).a
++	../install-sh -m 0755 -t $(DESTDIR)$(PREFIX)/lib/ $(LIBDIR)/$(OUT_VERSION)
++	$(RM) $(DESTDIR)$(PREFIX)/lib/$(OUT_MAJOR)
++	$(RM) $(DESTDIR)$(PREFIX)/lib/$(OUT_BASE)
++	$(LN_S) $(OUT_VERSION) $(DESTDIR)$(PREFIX)/lib/$(OUT_MAJOR)
++	$(LN_S) $(OUT_VERSION) $(DESTDIR)$(PREFIX)/lib/$(OUT_BASE)
++	../install-sh -m 0644 -t $(DESTDIR)$(PREFIX)/include/libkarma/ $(INST_HEADERS)
+ 
+ uninstall:
+ 	$(RM) $(PREFIX)/lib/$(TARGET).a $(PREFIX)/lib/$(OUT_MAJOR) $(PREFIX)/lib/$(OUT_BASE) $(PREFIX)/lib/$(OUT_VERSION)
+-	$(RM) -r $(DEST)/include/libkarma
++	$(RM) -r $(PREFIX)/include/libkarma
+ 
+ OBJS = $(SRCS:.c=.o)
+ 
+diff -ur libkarma-0.1.0.orig/tools/Makefile libkarma-0.1.0/tools/Makefile
+--- libkarma-0.1.0.orig/tools/Makefile	2007-05-15 19:29:02.000000000 +0300
++++ libkarma-0.1.0/tools/Makefile	2009-05-12 13:56:31.000000000 +0300
+@@ -17,8 +17,8 @@
+ 
+ SRCS=pathedit.c
+ 
+-CC=gcc
+-CFLAGS+=-Wall -pedantic -g
++CC?=gcc
++CFLAGS+=-Wall -pedantic
+ LDFLAGS+=-ltag_c -lz -L $(LIBDIR)
+ 
+ OBJS=$(SRCS:.c=.o)
+@@ -43,13 +43,13 @@
+ 	$(CC) $(INCLUDES) $(CFLAGS) $@.c -o $@ -lusb
+ 
+ install:
+-	../install-sh -m 0755 -d $(DEST)/bin
+-	../install-sh -m 0755 -t $(DEST)/bin/ $(TOOLS)
+-	../install-sh -m 0755 -d $(PREFIX)/share/man/man1
+-	../install-sh -m 0755 -t $(PREFIX)/share/man/man1 $(MANPAGES)
++	../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/bin
++	../install-sh -m 0755 -t $(DESTDIR)$(PREFIX)/bin/ $(TOOLS)
++	../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/share/man/man1
++	../install-sh -m 0755 -t $(DESTDIR)$(PREFIX)/share/man/man1 $(MANPAGES)
+ 
+ uninstall:
+-	cd $(DEST)/bin && $(RM) $(TOOLS)
++	cd $(PREFIX)/bin && $(RM) $(TOOLS)
+ 
+ .PHONY: clean
+ 
diff --git a/media-libs/libkarma/libkarma-0.1.0-r1.ebuild b/media-libs/libkarma/libkarma-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..d9ba671efb63
--- /dev/null
+++ b/media-libs/libkarma/libkarma-0.1.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/05/12 11:08:48 ssuominen Exp $
+
+EAPI=2
+inherit eutils mono toolchain-funcs
+
+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 ~x86"
+IUSE=""
+
+RDEPEND="virtual/libiconv
+	media-libs/taglib
+	dev-lang/mono
+	dev-libs/libusb"
+DEPEND="${RDEPEND}"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-destdir.patch
+}
+
+src_compile() {
+	tc-export AR CC RANLIB
+	emake all || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc THANKS TODO
+	mono_multilib_comply
+}
diff --git a/media-libs/libkarma/libkarma-0.1.0.ebuild b/media-libs/libkarma/libkarma-0.1.0.ebuild
index 80af7e43c392..4765f8886162 100644
--- a/media-libs/libkarma/libkarma-0.1.0.ebuild
+++ b/media-libs/libkarma/libkarma-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.7 2009/05/12 09:55:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkarma/libkarma-0.1.0.ebuild,v 1.8 2009/05/12 11:08:48 ssuominen Exp $
 
 EAPI=2
-inherit eutils mono multilib
+inherit eutils mono multilib toolchain-funcs
 
 DESCRIPTION="Support library for using Rio devices with mtp"
 HOMEPAGE="http://www.freakysoft.de/html/libkarma/"
@@ -28,6 +28,7 @@ src_prepare() {
 }
 
 src_compile() {
+	tc-export AR CC RANLIB
 	emake all || die "emake failed"
 }