diff options
| author |   James Broadhead <jamesbroadhead@gmail.com> | 2012-01-19 21:59:45 +0000 |
|---|---|---|
| committer | James Broadhead <jamesbroadhead@gmail.com> | 2012-01-19 21:59:45 +0000 |
| commit | a6d671050fc5a41234cf12eeeb739df03f9ab6db (patch) | |
| tree | 60dd754f33f07ca888d479506866e29b19a96bfe | |
| parent | Revert "MASK until fox:1.7 is unmasked" (diff) | |
| download | jamesbroadhead-a6d671050fc5a41234cf12eeeb739df03f9ab6db.tar.gz jamesbroadhead-a6d671050fc5a41234cf12eeeb739df03f9ab6db.tar.bz2 jamesbroadhead-a6d671050fc5a41234cf12eeeb739df03f9ab6db.zip | |
Bump gogglesmm
| -rw-r--r-- | media-sound/gogglesmm/Manifest | 6 | ||||
| -rw-r--r-- | media-sound/gogglesmm/gogglesmm-0.12.6.ebuild | 17 | ||||
| -rw-r--r-- | media-sound/gogglesmm/gogglesmm-9999.ebuild (renamed from media-sound/gogglesmm/gogglesmm-9999-r1.ebuild) | 32 |
3 files changed, 31 insertions, 24 deletions
diff --git a/media-sound/gogglesmm/Manifest b/media-sound/gogglesmm/Manifest index b587959..a087bb7 100644 --- a/media-sound/gogglesmm/Manifest +++ b/media-sound/gogglesmm/Manifest @@ -1,6 +1,6 @@ AUX gogglesmm-parallel-make.patch 515 RMD160 c0f73ca4e84d42adfa4bfbb76e21d513e471805c SHA1 4eedf3036543f1caade26fb1cedd6da5598d1b87 SHA256 8186feb8b93ecd797b6d74505fa0a9663b1e99a85e0a3cb800984e44dce0e0f4 -DIST gogglesmm-0.12.2.tar.bz2 403947 RMD160 02024d496a4864c032e887f42df69af51cce0d27 SHA1 ad876ac3d7d888153e3caf31366c8075845cce99 SHA256 b1895627986b1a4df7df47035b620cf8eaea1f79bb365412e2334928474bf099 -EBUILD gogglesmm-0.12.2-r1.ebuild 1181 RMD160 e3c9cbe951149a2464c309e502da6fface5bc369 SHA1 e8d4a989de45dc2710a880245f71647da349af06 SHA256 72b17aa0d372bf73daf4b6f232d0a4baf06362bacc8b809753618f462c748736 -EBUILD gogglesmm-9999-r1.ebuild 1053 RMD160 a3b139020b32c928c603e1a392a81d0bdb7a3d7d SHA1 766d13cb038e1c08b1a85130e6f105fc8a4a0308 SHA256 0d2c7073b53cc97658f3d840d1a0208d020e2ee016313dfde6391fb9c6560a5e +DIST gogglesmm-0.12.6.tar.bz2 430092 RMD160 e9cec32fdfba933ec6a91c0e562367cc409f5a5d SHA1 cb6771f4b7aa484e47aa4fa8cc41db4a1843104f SHA256 e0f62d1f9bc21345b557b7ca7730c2c5277cf4becc1e1132c50ce56006456b3d +EBUILD gogglesmm-0.12.6.ebuild 1197 RMD160 973913e1c5888b91858b48dfdffb81d0f35962c1 SHA1 7f9f9daba75e57cafde7c05eae5e94458b52d9c0 SHA256 e7867dfc5a3b85d2c1978d2705aed5b590d43e21aac40833136f78d2dce64836 +EBUILD gogglesmm-9999.ebuild 1197 RMD160 973913e1c5888b91858b48dfdffb81d0f35962c1 SHA1 7f9f9daba75e57cafde7c05eae5e94458b52d9c0 SHA256 e7867dfc5a3b85d2c1978d2705aed5b590d43e21aac40833136f78d2dce64836 MISC ChangeLog 1240 RMD160 930d2bf9588170275bfa965a8732328c34dccd58 SHA1 e80799a3b869c47895e43327986ca47792dcb9bb SHA256 4bbe780fcdea109cdcda5d1e0d2e855e116e74ce1fe88d0b9f99088d932897fa MISC metadata.xml 1015 RMD160 03f57e563b226ace3778eefb7962868be181203f SHA1 4e7e624d2a946c6c11af8a8378a1466eeafeba5c SHA256 53b9e5d5c68a680d1a6ac66a2156a2d73d0735457d8fb673d2a8cbda76c6ef16 diff --git a/media-sound/gogglesmm/gogglesmm-0.12.6.ebuild b/media-sound/gogglesmm/gogglesmm-0.12.6.ebuild index a5bfb33..1fcfdd3 100644 --- a/media-sound/gogglesmm/gogglesmm-0.12.6.ebuild +++ b/media-sound/gogglesmm/gogglesmm-0.12.6.ebuild @@ -8,25 +8,29 @@ inherit base DESCRIPTION="Lightweight FOX music collection manager and player" HOMEPAGE="http://gogglesmm.googlecode.com/" -SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2" +if [[ ${PV} == "9999" ]] ; then + inherit mercurial + EHG_REPO_URI="http://${PN}.googlecode.com/hg" + KEYWORDS="" +else + SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2" + KEYWORDS="~amd64 ~x86" +fi LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" IUSE="dbus gcrypt" RDEPEND="dev-db/sqlite:3 media-libs/taglib - =media-libs/xine-lib-1.1* + >=media-libs/gap-0.1_pre20111212 net-misc/curl - x11-libs/fox:1.6[png] + x11-libs/fox:1.7[png] dbus? ( sys-apps/dbus ) gcrypt? ( dev-libs/libgcrypt )" DEPEND="${RDEPEND}" DOCS=(AUTHORS README) -# Upstream patch to fix parallel builds. Won't be needed >=0.12.3 -PATCHES=( "${FILESDIR}/${PN}-parallel-make.patch" ) src_prepare() { # Note: Makefile is NOT affected by ./configure @@ -36,7 +40,6 @@ src_prepare() { } src_configure() { - local myeconfargs=( $(use_with dbus) ) if use gcrypt ; then diff --git a/media-sound/gogglesmm/gogglesmm-9999-r1.ebuild b/media-sound/gogglesmm/gogglesmm-9999.ebuild index 1f72abc..1fcfdd3 100644 --- a/media-sound/gogglesmm/gogglesmm-9999-r1.ebuild +++ b/media-sound/gogglesmm/gogglesmm-9999.ebuild @@ -4,21 +4,26 @@ EAPI=2 -inherit autotools-utils mercurial +inherit base DESCRIPTION="Lightweight FOX music collection manager and player" HOMEPAGE="http://gogglesmm.googlecode.com/" -EHG_REPO_URI="http://${PN}.googlecode.com/hg" +if [[ ${PV} == "9999" ]] ; then + inherit mercurial + EHG_REPO_URI="http://${PN}.googlecode.com/hg" + KEYWORDS="" +else + SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2" + KEYWORDS="~amd64 ~x86" +fi LICENSE="GPL-3" SLOT="0" -KEYWORDS="" IUSE="dbus gcrypt" RDEPEND="dev-db/sqlite:3 media-libs/taglib - media-libs/xine-lib - media-sound/gap + >=media-libs/gap-0.1_pre20111212 net-misc/curl x11-libs/fox:1.7[png] dbus? ( sys-apps/dbus ) @@ -28,23 +33,22 @@ DEPEND="${RDEPEND}" DOCS=(AUTHORS README) src_prepare() { + # Note: Makefile is NOT affected by ./configure sed -i -e 's:icons/hicolor/48x48/apps:pixmaps:' Makefile || die + + base_src_prepare } src_configure() { - local extraconf="--with-md5=internal" + local myeconfargs=( $(use_with dbus) ) if use gcrypt ; then - extraconf="--with-md5=gcrypt" + myeconfargs+=("--with-md5=gcrypt") + else + myeconfargs+=("--with-md5=internal") fi - local myeconfargs=( ${extraconf} $(use_with dbus) ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install + base_src_configure "${myeconfargs[@]}" } pkg_postinst() { |