Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-10-08 09:51:50 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-10-08 09:51:50 +0000
commit144865c444386e2891ade1579687a620c0b066c1 (patch)
tree38966a6316c5f18fc6ccf7552a6bb3a59da7ac85
parentregenerating manifest plus removing mips from 0.23 (diff)
downloadhistorical-144865c444386e2891ade1579687a620c0b066c1.tar.gz
historical-144865c444386e2891ade1579687a620c0b066c1.tar.bz2
historical-144865c444386e2891ade1579687a620c0b066c1.zip
multilib fixes. Stable amd64.
Diffstat
-rw-r--r--media-libs/libnjb/ChangeLog7
-rw-r--r--media-libs/libnjb/files/libnjb-1.2-gentoo-multilib.patch20
-rw-r--r--media-libs/libnjb/libnjb-1.0.ebuild11
-rw-r--r--media-libs/libnjb/libnjb-1.1.ebuild10
-rw-r--r--media-libs/libnjb/libnjb-1.2.ebuild11
-rw-r--r--media-libs/tse3/ChangeLog5
-rw-r--r--media-libs/tse3/tse3-0.2.7.ebuild20
7 files changed, 52 insertions, 32 deletions
diff --git a/media-libs/libnjb/ChangeLog b/media-libs/libnjb/ChangeLog
index 51659d4cd629..100bb3889fb0 100644
--- a/media-libs/libnjb/ChangeLog
+++ b/media-libs/libnjb/ChangeLog
@@ -1,9 +1,10 @@
# ChangeLog for media-libs/libnjb
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/ChangeLog,v 1.13 2004/10/07 03:00:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/ChangeLog,v 1.14 2004/10/08 09:46:58 eradicator Exp $
- 06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> libnjb-1.2.ebuild:
- get_libdir fixes.
+ 08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ +files/libnjb-1.2-gentoo-multilib.patch, libnjb-1.2.ebuild::
+ multilib fixes. Stable amd64.
*libnjb-1.2 (05 Oct 2004)
diff --git a/media-libs/libnjb/files/libnjb-1.2-gentoo-multilib.patch b/media-libs/libnjb/files/libnjb-1.2-gentoo-multilib.patch
new file mode 100644
index 000000000000..427037b02f14
--- /dev/null
+++ b/media-libs/libnjb/files/libnjb-1.2-gentoo-multilib.patch
@@ -0,0 +1,20 @@
+diff -Naur libnjb-1.2.orig/Makefile.in libnjb-1.2/Makefile.in
+--- libnjb-1.2.orig/Makefile.in 2004-05-25 07:38:21.000000000 -0700
++++ libnjb-1.2/Makefile.in 2004-10-08 02:41:10.801812805 -0700
+@@ -1,4 +1,5 @@
+ prefix=@prefix@
++libdir=@libdir@
+ exec_prefix=@exec_prefix@
+ top_builddir=@top_builddir@
+ mandir=@mandir@
+@@ -23,8 +24,8 @@
+
+ install-lib: lib
+ cd src && $(MAKE) install prefix=$(prefix) exec_prefix=$(exec_prefix)
+- $(INSTALL) -d $(prefix)/lib/pkgconfig
+- $(INSTALL) libnjb.pc $(prefix)/lib/pkgconfig
++ $(INSTALL) -d $(libdir)/pkgconfig
++ $(INSTALL) libnjb.pc $(libdir)/pkgconfig
+
+ install-docs:
+ $(INSTALL) -d $(mandir)/man3
diff --git a/media-libs/libnjb/libnjb-1.0.ebuild b/media-libs/libnjb/libnjb-1.0.ebuild
index e95ca30fbd0d..d7fae46c51f8 100644
--- a/media-libs/libnjb/libnjb-1.0.ebuild
+++ b/media-libs/libnjb/libnjb-1.0.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/media-libs/libnjb/libnjb-1.0.ebuild,v 1.6 2004/06/24 23:12:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-1.0.ebuild,v 1.7 2004/10/08 09:46:58 eradicator Exp $
inherit eutils
@@ -9,7 +9,6 @@ IUSE=""
DESCRIPTION="libnjb is a C library and API for communicating with the Creative Nomad JukeBox digital audio player under BSD and Linux."
HOMEPAGE="http://libnjb.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
LICENSE="BSD"
SLOT="0"
@@ -17,14 +16,12 @@ KEYWORDS="x86 ~amd64"
DEPEND=">=dev-libs/libusb-0.1.7"
S="${WORKDIR}/${PN}"
-src_compile() {
-
- unpack ${A}; cd ${S}
+src_unpack() {
+ unpack ${A}
+ cd ${S}
epatch ${FILESDIR}/libnjb-errno.patch
sed -i "s:all\: lib samples filemodes:all\: lib filemodes:g" Makefile.in
- econf || die "econf failed"
- emake || die
}
src_install() {
diff --git a/media-libs/libnjb/libnjb-1.1.ebuild b/media-libs/libnjb/libnjb-1.1.ebuild
index c29f1d62c5d6..2410afa607be 100644
--- a/media-libs/libnjb/libnjb-1.1.ebuild
+++ b/media-libs/libnjb/libnjb-1.1.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/media-libs/libnjb/libnjb-1.1.ebuild,v 1.4 2004/06/24 23:12:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-1.1.ebuild,v 1.5 2004/10/08 09:46:58 eradicator Exp $
inherit eutils
@@ -9,20 +9,18 @@ IUSE=""
DESCRIPTION="libnjb is a C library and API for communicating with the Creative Nomad JukeBox digital audio player under BSD and Linux."
HOMEPAGE="http://libnjb.sourceforge.net/"
SRC_URI="mirror://sourceforge/gnomad2/${P}.tar.gz"
-RESTRICT="nomirror"
LICENSE="BSD"
SLOT="0"
KEYWORDS="x86 amd64 ~ppc"
DEPEND=">=dev-libs/libusb-0.1.7"
-src_compile() {
- unpack ${A}; cd ${S}
+src_unpack() {
+ unpack ${A}
+ cd ${S}
epatch ${FILESDIR}/libnjb-errno.patch
sed -i "s:all\: lib samples filemodes:all\: lib filemodes:g" Makefile.in
- econf || die "./configure failed."
- emake -j1 || die "make failed."
}
src_install() {
diff --git a/media-libs/libnjb/libnjb-1.2.ebuild b/media-libs/libnjb/libnjb-1.2.ebuild
index dbf78a072132..f0ce4af46a9e 100644
--- a/media-libs/libnjb/libnjb-1.2.ebuild
+++ b/media-libs/libnjb/libnjb-1.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/media-libs/libnjb/libnjb-1.2.ebuild,v 1.3 2004/10/07 03:00:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-1.2.ebuild,v 1.4 2004/10/08 09:46:58 eradicator Exp $
IUSE=""
@@ -17,10 +17,15 @@ KEYWORDS="~x86 ~amd64 ~ppc"
DEPEND=">=dev-libs/libusb-0.1.7"
-src_compile() {
- unpack ${A}; cd ${S}
+src_unpack() {
+ unpack ${A}
+ cd ${S}
sed -i "s:all\: lib samples filemodes:all\: lib filemodes:g" Makefile.in
+ epatch ${FILESDIR}/${P}-gentoo-multilib.patch
+}
+
+src_compile() {
econf || die "./configure failed."
emake -j1 || die "make failed."
}
diff --git a/media-libs/tse3/ChangeLog b/media-libs/tse3/ChangeLog
index 81391045c9df..d8c71e646c66 100644
--- a/media-libs/tse3/ChangeLog
+++ b/media-libs/tse3/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/tse3
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tse3/ChangeLog,v 1.9 2004/09/01 17:31:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tse3/ChangeLog,v 1.10 2004/10/08 09:51:50 eradicator Exp $
+
+ 08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> tse3-0.2.7.ebuild:
+ multilib fixes.
01 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> tse3-0.2.7.ebuild:
Stable amd64, sparc.
diff --git a/media-libs/tse3/tse3-0.2.7.ebuild b/media-libs/tse3/tse3-0.2.7.ebuild
index 61c925950185..5649be67296f 100644
--- a/media-libs/tse3/tse3-0.2.7.ebuild
+++ b/media-libs/tse3/tse3-0.2.7.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/media-libs/tse3/tse3-0.2.7.ebuild,v 1.12 2004/09/01 17:31:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tse3/tse3-0.2.7.ebuild,v 1.13 2004/10/08 09:51:50 eradicator Exp $
IUSE="alsa oss arts"
@@ -35,19 +35,15 @@ src_unpack() {
src_compile() {
local myconf=""
- use arts || myconf="$myconf --without-arts"
- use alsa || myconf="$myconf --without-alsa"
- use oss || myconf="$myconf --without-oss"
- ./configure \
- --host=${CHOST} \
- --prefix=/usr \
- --infodir=/usr/share/info \
- --mandir=/usr/share/man \
- $myconf || die "./configure failed"
- make || die
+ use arts || myconf="${myconf} --without-arts"
+ use alsa || myconf="${myconf} --without-alsa"
+ use oss || myconf="${myconf} --without-oss"
+
+ econf ${myconf} || die "./configure failed"
+ emake -j1 || die
}
src_install() {
- make DESTDIR=${D} install || die
+ make DESTDIR="${D}" install || die
dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO Version
}