summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven J Newbury <steve@snewbury.org.uk>2009-04-07 10:29:05 +0100
committerSteven J Newbury <steve@snewbury.org.uk>2009-04-07 10:29:05 +0100
commit177bb1bdfb8ba4463f7c73dd8d7583406c4cd769 (patch)
tree7c3b76985b15f835b3c81af5b85f63cc6ad2588e /media-sound
parentHandle gtk-1* gtk-config-x86 (diff)
downloadmultilib-portage-177bb1bdfb8ba4463f7c73dd8d7583406c4cd769.tar.gz
multilib-portage-177bb1bdfb8ba4463f7c73dd8d7583406c4cd769.tar.bz2
multilib-portage-177bb1bdfb8ba4463f7c73dd8d7583406c4cd769.zip
media-sound/lame has an optional dependency on gtk-1* add it to RDEPEND
with lib32 USE dep
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/lame/Manifest6
-rw-r--r--media-sound/lame/lame-3.97-r1.ebuild15
-rw-r--r--media-sound/lame/lame-3.98.2.ebuild6
-rw-r--r--media-sound/lame/lame-3.98.ebuild15
4 files changed, 21 insertions, 21 deletions
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index 966248b2d..b1d27e440 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -10,8 +10,8 @@ AUX lame-3.98-stdint.patch 651 RMD160 84a732f356ac05941d90c2a261f9d624fc38bc5b S
DIST lame-3.97.tar.gz 1328058 RMD160 5c4cf02c0f4e10c4cd2ab610d62478b554cd0873 SHA1 acf56065f4e31ce023b0f99002d537adb1ec09df SHA256 0a2334a6d11085298a9a3c46d5d310cca012f2e61d6efae90840a76a364dbe17
DIST lame-398-2.tar.gz 1327643 RMD160 767dd94271eef221170469535db2bf388149715a SHA1 b2db41dbc9c0824caa102e8c932b820c79ccd5ec SHA256 a17a28569d8ed1e514915c1f12bdf4eedac506e5fbdf9a429ba97d5d42c9af32
DIST lame-398.tar.gz 1415983 RMD160 754343791ac80d2403291c63f99eb409bca6b62f SHA1 287979d076834882c99d0cc01ddbd9b3697ceaae SHA256 8396bcb425ddcbfb8027d5712fa8878a2257006ccbe3ac7a772e1652e43d19b1
-EBUILD lame-3.97-r1.ebuild 2430 RMD160 4cd81787357231b821483048162721964598b6a8 SHA1 8ce9989e5856ab3caaf0ada25d7eb9fe466e6fa2 SHA256 1aa3355b392db5fb533e6f46dcabe218ed857f593786aa76e6f064b7ab10dcc6
-EBUILD lame-3.98.2.ebuild 2564 RMD160 176a1091c835287f5fa8ddeb87c06980910953df SHA1 73b4abbf8f57aaa1da036d57c599d8585e6b0ea9 SHA256 dbda9ae7e6ef67a55eb8e1e49d918ae2f2081e25e75ba37f14c85d355a8f906f
-EBUILD lame-3.98.ebuild 2994 RMD160 5a0e82d0b012c9dabd68a447cc7bc148102696c0 SHA1 bfcd33b94f7a0caa96d6bbd0cd379cc674909dc9 SHA256 50dfc7ebfeaa440301212e9054f473a03e147a4718c1071528a734460071c7fb
+EBUILD lame-3.97-r1.ebuild 2463 RMD160 817c39ec6f5df1a9790b24b8305a7576d3071604 SHA1 1b7a018e4a1547c333d7583c640bb353628953ce SHA256 bc40029ced32790978ab609d7221f70f106a4abb6fb9ca3c8f62e387a86b5e32
+EBUILD lame-3.98.2.ebuild 2636 RMD160 4612a529ad55e2eb66972a2d7aa0cb19b74d36d8 SHA1 71deb751279cadb26ebf649fbaf327877b63bd31 SHA256 5766fcae3fdedc9f4642ef28bf00049cd43725556a223738cebab2a53560f932
+EBUILD lame-3.98.ebuild 3026 RMD160 e71670b4696178c25c4f4e2480af3c16d3735c2e SHA1 7292753f34bd07cb7859ed770287fc0f6b996f9b SHA256 e8c33bc9898d41c7adb22a0b5876f96aa95431d49d3eccb498c70adb969a81fc
MISC ChangeLog 14986 RMD160 a8d8f2cc563f19cbf076a7e55dd7a74eb64acd63 SHA1 149ea580edecd730ddbae9976e1ab955d00669ea SHA256 b2c3ba3f8f0325a4bb491407531a9e2ec29a74e32f12393406dc2522c57bddab
MISC metadata.xml 264 RMD160 a6be36fe4dffbf9280e34fafcf40571d0f960580 SHA1 7e6bff4996ab638c7e04e31197d3b45f9752c00f SHA256 69ff3c8176be87b9e058cf261280c392e026742616602914b8ee3e3b6eaa2280
diff --git a/media-sound/lame/lame-3.97-r1.ebuild b/media-sound/lame/lame-3.97-r1.ebuild
index 16c890c00..cac84ec58 100644
--- a/media-sound/lame/lame-3.97-r1.ebuild
+++ b/media-sound/lame/lame-3.97-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.97-r1.ebuild,v 1.11 2008/11/09 21:06:42 loki_val Exp $
-EAPI="1"
+EAPI="2"
inherit flag-o-matic toolchain-funcs eutils autotools multilib-native
@@ -13,13 +13,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug mp3rtp"
+IUSE="debug mp3rtp gtk"
-RDEPEND=">=sys-libs/ncurses-5.2[lib32?]"
+RDEPEND=">=sys-libs/ncurses-5.2[lib32?]
+ gtk? ( =x11-libs/gtk+-1.2*[lib32?] )"
DEPEND="${RDEPEND}"
-src_unpack() {
- unpack ${A}
+src_prepare() {
cd "${S}"
# The frontened tries to link staticly, but we prefer shared libs
@@ -39,7 +39,7 @@ src_unpack() {
epunt_cxx # embedded bug #74498
}
-multilib-native_src_compile_internal() {
+multilib-native_src_configure_internal() {
# take out -fomit-frame-pointer from CFLAGS if k6-2
is-flag "-march=k6-3" && filter-flags "-fomit-frame-pointer"
is-flag "-march=k6-2" && filter-flags "-fomit-frame-pointer"
@@ -55,9 +55,8 @@ multilib-native_src_compile_internal() {
$(use_enable debug debug norm) \
--disable-mp3x \
$(use_enable mp3rtp mp3rtp) \
+ $(use_enable gtk gtktest) \
${myconf} || die "econf failed"
-
- emake || die "emake failed"
}
multilib-native_src_install_internal() {
diff --git a/media-sound/lame/lame-3.98.2.ebuild b/media-sound/lame/lame-3.98.2.ebuild
index 60b2cb43c..0744f226e 100644
--- a/media-sound/lame/lame-3.98.2.ebuild
+++ b/media-sound/lame/lame-3.98.2.ebuild
@@ -17,10 +17,11 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug mmx mp3rtp sndfile"
+IUSE="debug mmx mp3rtp sndfile gtk"
RDEPEND=">=sys-libs/ncurses-5.2[lib32?]
- sndfile? ( >=media-libs/libsndfile-1.0.2[lib32?] )"
+ sndfile? ( >=media-libs/libsndfile-1.0.2[lib32?] )
+ gtk? ( =x11-libs/gtk+-1.2*[lib32?] )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
mmx? ( dev-lang/nasm )"
@@ -60,6 +61,7 @@ multilib-native_src_configure_internal() {
--disable-mp3x \
$(use_enable mmx nasm) \
$(use_enable mp3rtp) \
+ $(use_enable gtk gtktest) \
${myconf} || die "econf failed"
}
diff --git a/media-sound/lame/lame-3.98.ebuild b/media-sound/lame/lame-3.98.ebuild
index fe58de6e0..ea1119aaf 100644
--- a/media-sound/lame/lame-3.98.ebuild
+++ b/media-sound/lame/lame-3.98.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.98.ebuild,v 1.6 2008/08/08 08:29:25 aballier Exp $
-EAPI="1"
+EAPI="2"
inherit flag-o-matic toolchain-funcs eutils autotools versionator multilib-native
@@ -16,16 +16,16 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug mmx mp3rtp sndfile"
+IUSE="debug mmx mp3rtp sndfile gtk"
RDEPEND=">=sys-libs/ncurses-5.2[lib32?]
- sndfile? ( >=media-libs/libsndfile-1.0.2[lib32?] )"
+ sndfile? ( >=media-libs/libsndfile-1.0.2[lib32?] )
+ gtk? ( =x11-libs/gtk+-1.2*[lib32?] )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
mmx? ( dev-lang/nasm )"
-src_unpack() {
- unpack ${A}
+src_prepare() {
cd "${S}"
# The frontened tries to link staticly, but we prefer shared libs
@@ -61,7 +61,7 @@ src_unpack() {
epunt_cxx # embedded bug #74498
}
-multilib-native_src_compile_internal() {
+multilib-native_src_configure_internal() {
use sndfile && myconf="--with-fileio=sndfile"
# The user sets compiler optimizations... But if you'd like
# lame to choose it's own... uncomment one of these (experiMENTAL)
@@ -74,9 +74,8 @@ multilib-native_src_compile_internal() {
--disable-mp3x \
$(use_enable mmx nasm) \
$(use_enable mp3rtp) \
+ $(use_enable gtk gtktest) \
${myconf} || die "econf failed"
-
- emake || die "emake failed"
}
multilib-native_src_install_internal() {