* [gentoo-commits] gentoo-x86 commit in media-sound/alsa-headers: alsa-headers-1.0.25-r1.ebuild ChangeLog alsa-headers-9999.ebuild
@ 2013-04-16 4:09 Samuli Suominen (ssuominen)
0 siblings, 0 replies; only message in thread
From: Samuli Suominen (ssuominen) @ 2013-04-16 4:09 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/04/16 04:09:13
Modified: ChangeLog alsa-headers-9999.ebuild
Added: alsa-headers-1.0.25-r1.ebuild
Log:
Synchronize the ebuild for 1.* with 9999 using if and else.
(Portage version: 2.2.0_alpha172/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.221 media-sound/alsa-headers/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-headers/ChangeLog?rev=1.221&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-headers/ChangeLog?rev=1.221&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-headers/ChangeLog?r1=1.220&r2=1.221
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/ChangeLog,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- ChangeLog 13 Mar 2013 10:57:18 -0000 1.220
+++ ChangeLog 16 Apr 2013 04:09:12 -0000 1.221
@@ -1,6 +1,12 @@
# ChangeLog for media-sound/alsa-headers
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/ChangeLog,v 1.220 2013/03/13 10:57:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/ChangeLog,v 1.221 2013/04/16 04:09:12 ssuominen Exp $
+
+*alsa-headers-1.0.25-r1 (16 Apr 2013)
+
+ 16 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
+ +alsa-headers-1.0.25-r1.ebuild, alsa-headers-9999.ebuild:
+ Synchronize the ebuild for 1.* with 9999 using if and else.
13 Mar 2013; Agostino Sarubbo <ago@gentoo.org> alsa-headers-1.0.25.ebuild:
Stable for ppc, wrt bug #406101
1.9 media-sound/alsa-headers/alsa-headers-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-headers/alsa-headers-9999.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-headers/alsa-headers-9999.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-headers/alsa-headers-9999.ebuild?r1=1.8&r2=1.9
Index: alsa-headers-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- alsa-headers-9999.ebuild 21 Sep 2011 08:11:50 -0000 1.8
+++ alsa-headers-9999.ebuild 16 Apr 2013 04:09:13 -0000 1.9
@@ -1,43 +1,50 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-9999.ebuild,v 1.8 2011/09/21 08:11:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-9999.ebuild,v 1.9 2013/04/16 04:09:13 ssuominen Exp $
-inherit eutils git-2
+EAPI=5
+
+if [[ ${PV} = 9999* ]]; then
+ inherit git-2
+else
+ MY_P=${P/headers/driver}
+ SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
+ S=${WORKDIR}/${MY_P}
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+inherit eutils
DESCRIPTION="Header files for Advanced Linux Sound Architecture kernel modules"
HOMEPAGE="http://www.alsa-project.org/"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS=""
IUSE=""
-DEPEND=""
-RDEPEND=""
-
RESTRICT="binchecks strip"
EGIT_REPO_URI="git://git.alsa-project.org/alsa-kmirror.git
http://git.alsa-project.org/http/alsa-kmirror.git"
-# Remove the sound symlink workaround...
pkg_setup() {
- if [[ -L "${ROOT}/usr/include/sound" ]]; then
- rm "${ROOT}/usr/include/sound"
+ local obsolete_symlink="${ROOT}"/usr/include/sound
+ if [[ -L ${obsolete_symlink} ]]; then
+ ebegin "Removing obsolete symlink ${obsolete_symlink}"
+ rm "${obsolete_symlink}"
+ eend $?
fi
}
-src_unpack() {
- git-2_src_unpack
-
- cd "${S}"
- epatch "${FILESDIR}/${PN}-1.0.6a-user.patch"
+src_prepare() {
+ [[ ${PV} = 9999* ]] || epatch "${FILESDIR}"/${PN}-1.0.6a-user.patch
}
-src_compile() { : ; }
+src_configure() { :; }
+src_compile() { :; }
src_install() {
- cd "${S}/include"
+ [[ ${PV} = 9999* ]] || cd alsa-kernel
insinto /usr/include/sound
- doins *.h || die "include failed"
+ doins include/*.h
}
1.1 media-sound/alsa-headers/alsa-headers-1.0.25-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-headers/alsa-headers-1.0.25-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/alsa-headers/alsa-headers-1.0.25-r1.ebuild?rev=1.1&content-type=text/plain
Index: alsa-headers-1.0.25-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-1.0.25-r1.ebuild,v 1.1 2013/04/16 04:09:12 ssuominen Exp $
EAPI=5
if [[ ${PV} = 9999* ]]; then
inherit git-2
else
MY_P=${P/headers/driver}
SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
S=${WORKDIR}/${MY_P}
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
inherit eutils
DESCRIPTION="Header files for Advanced Linux Sound Architecture kernel modules"
HOMEPAGE="http://www.alsa-project.org/"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
IUSE=""
RESTRICT="binchecks strip"
EGIT_REPO_URI="git://git.alsa-project.org/alsa-kmirror.git
http://git.alsa-project.org/http/alsa-kmirror.git"
pkg_setup() {
local obsolete_symlink="${ROOT}"/usr/include/sound
if [[ -L ${obsolete_symlink} ]]; then
ebegin "Removing obsolete symlink ${obsolete_symlink}"
rm "${obsolete_symlink}"
eend $?
fi
}
src_prepare() {
[[ ${PV} = 9999* ]] || epatch "${FILESDIR}"/${PN}-1.0.6a-user.patch
}
src_configure() { :; }
src_compile() { :; }
src_install() {
[[ ${PV} = 9999* ]] || cd alsa-kernel
insinto /usr/include/sound
doins include/*.h
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-04-16 4:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-16 4:09 [gentoo-commits] gentoo-x86 commit in media-sound/alsa-headers: alsa-headers-1.0.25-r1.ebuild ChangeLog alsa-headers-9999.ebuild Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox