From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qav1C-0004iJ-Ri for garchives@archives.gentoo.org; Sun, 26 Jun 2011 19:29:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75B141C06B; Sun, 26 Jun 2011 19:29:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2D4DD1C06B for ; Sun, 26 Jun 2011 19:29:10 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8907A1B4034 for ; Sun, 26 Jun 2011 19:29:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A51038003C for ; Sun, 26 Jun 2011 19:29:08 +0000 (UTC) From: "Christoph Mende" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Mende" Message-ID: Subject: [gentoo-commits] dev/angelos:master commit in: media-sound/oss/ X-VCS-Repository: dev/angelos X-VCS-Files: media-sound/oss/Manifest media-sound/oss/oss-4.2.2004.ebuild X-VCS-Directories: media-sound/oss/ X-VCS-Committer: angelos X-VCS-Committer-Name: Christoph Mende X-VCS-Revision: c8a0e4819ab3ffb129e78cc30a4d12b135112141 Date: Sun, 26 Jun 2011 19:29:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c8eef5005688e36a6d563c398858cb03 commit: c8a0e4819ab3ffb129e78cc30a4d12b135112141 Author: Christoph Mende gentoo org> AuthorDate: Sun Jun 26 19:29:00 2011 +0000 Commit: Christoph Mende gentoo org> CommitDate: Sun Jun 26 19:29:00 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/angelos.git;a=3D= commit;h=3Dc8a0e481 oss: Fix installation on systems without multilib (Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit = with key 84F20B43) --- media-sound/oss/Manifest | 8 ++++---- media-sound/oss/oss-4.2.2004.ebuild | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/media-sound/oss/Manifest b/media-sound/oss/Manifest index 2e2947b..8112a77 100644 --- a/media-sound/oss/Manifest +++ b/media-sound/oss/Manifest @@ -2,12 +2,12 @@ Hash: SHA256 =20 DIST oss-v4.2-build2004-src-gpl.tar.bz2 1790085 RMD160 7b62cb96bf363d1c0= a4018e21b0737ec5ee3c5b5 SHA1 75c3ff1cf3e3bd5b351b1f778100387f998c7f3a SHA= 256 6a4ac364c6ed022467b23a9db137857afa9f8e9706a4bdbcb85b98efcde3f4a0 -EBUILD oss-4.2.2004.ebuild 1515 RMD160 3f1046393a18a88d1f395efa0db090394= 41d60c4 SHA1 cb3bd5a72b95a6421867f2b735fd9c57bd0ad096 SHA256 643150f8ba90= 4c572d60a37809b95860848a0c08280843eeedb8567a286cfb07 +EBUILD oss-4.2.2004.ebuild 1607 RMD160 23c1494f678c2ca5d3c7d80117240f238= 10a08c7 SHA1 f9450c41fe87cd338b8bd2a1c698a8c384122969 SHA256 4e8dac15c62c= aed55fe109f0805769a13739b3096acc6da066c6d0769641cdb3 MISC metadata.xml 255 RMD160 cd8d8cec82e20fbae3ec50adc77e3a847bf1cf59 SH= A1 5f93424a5e9854f99452b62eb10fff6f31dd797a SHA256 d51928368dff5a07c452c5= 0b7f1a5866f6ef9fbf578e372ef378363259843f5e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iF4EAREIAAYFAk4HeU0ACgkQmWq1bYTyC0PNyAEAkJ8jZZt4hOlipHfKAj2IUVaB -XfQgrAVRTrkAkaMYGpgA/1EKsOUcb939sjdff9QBEx/J7dcvRVlHDEl8fx2lc2CQ -=3D6GNy +iF4EAREIAAYFAk4HiHwACgkQmWq1bYTyC0O4DAD/XWgOv1EF/WQG/8BtsElJ8Rgx +nQfthg2nSdmUtEWj/00BALhenLV/PehT/zrA99d9C3S4WOpAgMoCFthgWkKB8sJI +=3DfJl/ -----END PGP SIGNATURE----- diff --git a/media-sound/oss/oss-4.2.2004.ebuild b/media-sound/oss/oss-4.= 2.2004.ebuild index 90e0495..663ca50 100644 --- a/media-sound/oss/oss-4.2.2004.ebuild +++ b/media-sound/oss/oss-4.2.2004.ebuild @@ -29,6 +29,8 @@ BUILD_DIR=3D${WORKDIR}/${PN}-build # - (automagic?) gtk+ ossxmix # - don't install via cp? (see FreeBSD) # - check libdir paths +# - init script +# - kernel checks (-> OSS emulation)? =20 src_prepare() { # the build system forces shadow builds @@ -65,7 +67,9 @@ src_compile() { =20 src_install() { cd "${BUILD_DIR}" - mv prototype/usr/lib prototype/usr/$(get_libdir) || die + if [ -n "$(get_libdir)" ]; then + mv prototype/usr/lib prototype/usr/$(get_libdir) || die + fi sed -e "s:lib:$(get_libdir):" prototype/etc/oss.conf || die cp -r prototype/* "${ED}" || die dodoc RELNOTES.txt