diff options
| -rw-r--r-- | media-sound/moc/ChangeLog | 12 | ||||
| -rw-r--r-- | media-sound/moc/Manifest | 24 | ||||
| -rw-r--r-- | media-sound/moc/files/digest-moc-1.1.0 | 1 | ||||
| -rw-r--r-- | media-sound/moc/files/digest-moc-2.1.4-r1 (renamed from media-sound/moc/files/digest-moc-2.1.4) | 0 | ||||
| -rw-r--r-- | media-sound/moc/files/digest-moc-2.2.0-r1 (renamed from media-sound/moc/files/digest-moc-2.2.0) | 0 | ||||
| -rw-r--r-- | media-sound/moc/files/moc-1.1.0-gcc3.patch | 115 | ||||
| -rw-r--r-- | media-sound/moc/files/moc-1.1.0-gcc34.patch | 10 | ||||
| -rw-r--r-- | media-sound/moc/moc-1.1.0.ebuild | 42 | ||||
| -rw-r--r-- | media-sound/moc/moc-2.1.4-r1.ebuild (renamed from media-sound/moc/moc-2.1.4.ebuild) | 14 | ||||
| -rw-r--r-- | media-sound/moc/moc-2.2.0-r1.ebuild (renamed from media-sound/moc/moc-2.2.0.ebuild) | 15 |
10 files changed, 32 insertions, 201 deletions
diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog index 2497bf98a136..ed71fb92118b 100644 --- a/media-sound/moc/ChangeLog +++ b/media-sound/moc/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-sound/moc # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.14 2005/03/29 10:54:06 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.15 2005/04/18 19:13:29 luckyduck Exp $ + +*moc-2.2.0-r1 (18 Apr 2005) + + 18 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> + -files/moc-1.1.0-gcc3.patch, -files/moc-1.1.0-gcc34.patch, + -moc-1.1.0.ebuild, +moc-2.1.4-r1.ebuild, -moc-2.1.4.ebuild, + +moc-2.2.0-r1.ebuild, -moc-2.2.0.ebuild: + neither a binary nor a symlink named moc gets installed any longer, fixes bug + #76702. also did some cleanup and moved oggvorbis useflag to vorbis, oggvorbis + is deprecated. 29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> moc-2.2.0.ebuild: introduced support for the flac useflag, fixes #86226 diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest index d6a38d057a44..1506e8dd5da0 100644 --- a/media-sound/moc/Manifest +++ b/media-sound/moc/Manifest @@ -1,20 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 034a690a78c8a4ec539fc17b8f30e6f4 moc-1.1.0.ebuild 1031 -MD5 f9f10ffd5858180b375351523da7347f moc-2.2.0.ebuild 1160 -MD5 3acbcab5eaa27a4ea27c581410d72240 ChangeLog 1829 +MD5 0972d3704064a4bc5f411794eaf14940 moc-2.1.4-r1.ebuild 1094 +MD5 162f4b70c8169c5bca859b82cc5f7043 moc-2.2.0-r1.ebuild 1198 +MD5 8fbb5e34749fad25a470351a544c045d ChangeLog 2255 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 -MD5 20a4ed30ecafd0d58e25f6ebab39e57c moc-2.1.4.ebuild 1055 -MD5 a90f9e3223b6e3cb5a0bf42b862d130e files/digest-moc-1.1.0 61 -MD5 986d4f67476a2c02f6ca1b20e7c57c0b files/digest-moc-2.1.4 61 -MD5 285908314a37f1af4c045d98d60a1e0d files/digest-moc-2.2.0 61 -MD5 ffe585145e5d7dfe41d78a4b05a36802 files/moc-1.1.0-gcc3.patch 4196 -MD5 5a9ee40731b6659c61c667199e041802 files/moc-1.1.0-gcc34.patch 211 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCSTPh06ebR+OMO78RAna1AKCZs9leJsj06qv4k8mZqbUI3NjQRwCfetmv -mOMuA6RhQySbC61j50iANwo= -=jMlV ------END PGP SIGNATURE----- +MD5 986d4f67476a2c02f6ca1b20e7c57c0b files/digest-moc-2.1.4-r1 61 +MD5 285908314a37f1af4c045d98d60a1e0d files/digest-moc-2.2.0-r1 61 diff --git a/media-sound/moc/files/digest-moc-1.1.0 b/media-sound/moc/files/digest-moc-1.1.0 deleted file mode 100644 index 9a75225be171..000000000000 --- a/media-sound/moc/files/digest-moc-1.1.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 20102e29d0c2e87287295aba424a5cf0 moc-1.1.0.tar.gz 117007 diff --git a/media-sound/moc/files/digest-moc-2.1.4 b/media-sound/moc/files/digest-moc-2.1.4-r1 index b124488e7655..b124488e7655 100644 --- a/media-sound/moc/files/digest-moc-2.1.4 +++ b/media-sound/moc/files/digest-moc-2.1.4-r1 diff --git a/media-sound/moc/files/digest-moc-2.2.0 b/media-sound/moc/files/digest-moc-2.2.0-r1 index 760902b08d62..760902b08d62 100644 --- a/media-sound/moc/files/digest-moc-2.2.0 +++ b/media-sound/moc/files/digest-moc-2.2.0-r1 diff --git a/media-sound/moc/files/moc-1.1.0-gcc3.patch b/media-sound/moc/files/moc-1.1.0-gcc3.patch deleted file mode 100644 index 518f04bc9eea..000000000000 --- a/media-sound/moc/files/moc-1.1.0-gcc3.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -ur moc-1.1.0/interface.c moc-1.1.0-gentoo/interface.c ---- moc-1.1.0/interface.c 2002-12-01 10:33:23.000000000 +1300 -+++ moc-1.1.0-gentoo/interface.c 2003-10-18 23:25:01.000000000 +1300 -@@ -573,36 +573,33 @@ - wbkgd (main_subwin, COLOR_PAIR(1)); - werase (main_subwin); - -- mvwprintw (main_subwin, 0, 0, "\ -- UP, DOWN Move up and down in the menu -- PAGE UP/DOWN Move one page up/down -- HOME, END Move to the first, last item -- ENTER Start playing files (from this file) or go to directory -- s Stop playing -- n Next song -- p Pause/unpause -- LEFT, RIGHT Seek backward, forward -- h Show this help screen -- f Switch between short and full names -- m Go to the music directory (requires an entry in the config) -- r Redraw the screen -- a/A Add file to the playlist / Add directory recursively -- d/C Delete item from the playlist / Clear the playlist -- l Switch between playlist and file list -- S/R Switch shuffle / repeat --"); -+ mvwprintw (main_subwin, 0, 0, "\n" -+" UP, DOWN Move up and down in the menu\n" -+" PAGE UP/DOWN Move one page up/down\n" -+" HOME, END Move to the first, last item\n" -+" ENTER Start playing files (from this file) or go to directory\n" -+" s Stop playing\n" -+" n Next song\n" -+" p Pause/unpause\n" -+" LEFT, RIGHT Seek backward, forward\n" -+" h Show this help screen\n" -+" f Switch between short and full names\n" -+" m Go to the music directory (requires an entry in the config)\n" -+" r Redraw the screen\n" -+" a/A Add file to the playlist / Add directory recursively\n" -+" d/C Delete item from the playlist / Clear the playlist\n" -+" l Switch between playlist and file list\n" -+" S/R Switch shuffle / repeat\n"); - - #ifdef VERSION_CHECKER -- wprintw (main_subwin, "\ -- v Check if a newer version of the MOC is available --"); -+ wprintw (main_subwin, "\n" -+" v Check if a newer version of the MOC is available\n"); - #endif -- -+ - #ifdef HAVE_OSS -- wprintw (main_subwin, "\ -- '.' , ',' Increase, decrease volume by 5% -- '>' , '<' Increase, decrease volume by 1% --"); -+ wprintw (main_subwin, "\n" -+" '.' , ',' Increase, decrease volume by 5%\n" -+" '>' , '<' Increase, decrease volume by 1%\n"); - #endif - - wrefresh (main_subwin); -diff -ur moc-1.1.0/main.c moc-1.1.0-gentoo/main.c ---- moc-1.1.0/main.c 2002-12-01 22:39:18.000000000 +1300 -+++ moc-1.1.0-gentoo/main.c 2003-10-18 23:21:15.000000000 +1300 -@@ -77,27 +77,27 @@ - - /* Show program usage and exit */ - static void usage (const char *prg_name) { -- printf ("\ --"PACKAGE_STRING" --Usage: --%s [OPTIONS]... [FILE]... ---V --version Show program version and exit. ---h --help Show usage and exit. ---r --recursively Add files in direstories given as an argument -- recursively. ---f --fullinfo Show titles (eg from id3tags) instead of names in the -- menu (default). ---s --shortinfo Show file names in the menu (opposite to -f). ---m --musicdir Go to your music directory after start (requires such -- entry in the config file). ---e --errors Show errors in streams. ---n --no-errors Do not show errors in streams (opposite to -e). ---p --priority N Set the priority to a given value. ---l --dont-play Don't start playing files added as command line -- arguments. ---R --repeat Turn on repeat. ---E --no-repeat Turn off repeat. --", prg_name); -+ printf ("\n" -+PACKAGE_STRING"\n" -+"Usage:\n" -+"%s [OPTIONS]... [FILE]...\n" -+"-V --version Show program version and exit.\n" -+"-h --help Show usage and exit.\n" -+"-r --recursively Add files in direstories given as an argument\n" -+" recursively.\n" -+"-f --fullinfo Show titles (eg from id3tags) instead of names in the\n" -+" menu (default).\n" -+"-s --shortinfo Show file names in the menu (opposite to -f).\n" -+"-m --musicdir Go to your music directory after start (requires such\n" -+" entry in the config file).\n" -+"-e --errors Show errors in streams.\n" -+"-n --no-errors Do not show errors in streams (opposite to -e).\n" -+"-p --priority N Set the priority to a given value.\n" -+"-l --dont-play Don't start playing files added as command line\n" -+" arguments.\n" -+"-R --repeat Turn on repeat.\n" -+"-E --no-repeat Turn off repeat.\n" -+, prg_name); - } - - /* Return the current directory name */ diff --git a/media-sound/moc/files/moc-1.1.0-gcc34.patch b/media-sound/moc/files/moc-1.1.0-gcc34.patch deleted file mode 100644 index 00e234978d1b..000000000000 --- a/media-sound/moc/files/moc-1.1.0-gcc34.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- interface.c.org 2004-11-14 12:02:20.299531311 +0000 -+++ interface.c 2004-11-14 12:02:30.669978183 +0000 -@@ -1033,6 +1033,7 @@ - return_menu (); - break; - default: -+ break; - } - } - #endif diff --git a/media-sound/moc/moc-1.1.0.ebuild b/media-sound/moc/moc-1.1.0.ebuild deleted file mode 100644 index 58fa6b3c5153..000000000000 --- a/media-sound/moc/moc-1.1.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-1.1.0.ebuild,v 1.13 2005/01/11 12:47:42 eradicator Exp $ - -IUSE="oggvorbis mad oss" - -inherit eutils - -DESCRIPTION="Music On Console - ncurses interface for playing audio files" -HOMEPAGE="http://moc.daper.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 sparc x86" - -DEPEND="media-libs/libao - sys-libs/ncurses - oggvorbis? ( media-libs/libvorbis ) - mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-gcc3.patch - epatch ${FILESDIR}/${P}-gcc34.patch -} - -src_compile() { - local myconf - use oggvorbis || myconf="--without-ogg" - use mad || myconf="${myconf} --without-mp3" - use oss || myconf="${myconf} --without-oss" - - econf ${myconf} || die - emake || die -} - -src_install () { - make DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog NEWS README TODO -} diff --git a/media-sound/moc/moc-2.1.4.ebuild b/media-sound/moc/moc-2.1.4-r1.ebuild index d5e344392c61..1971b3e308f2 100644 --- a/media-sound/moc/moc-2.1.4.ebuild +++ b/media-sound/moc/moc-2.1.4-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.1.4.ebuild,v 1.1 2005/01/21 18:33:10 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.1.4-r1.ebuild,v 1.1 2005/04/18 19:13:29 luckyduck Exp $ -IUSE="oggvorbis mad oss" +IUSE="vorbis mad oss" inherit eutils @@ -16,12 +16,12 @@ KEYWORDS="amd64 sparc x86" DEPEND="media-libs/libao sys-libs/ncurses - oggvorbis? ( media-libs/libvorbis ) + vorbis? ( media-libs/libvorbis ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )" src_compile() { local myconf - use oggvorbis || myconf="--without-ogg" + use vorbis || myconf="--without-ogg" use mad || myconf="${myconf} --without-mp3" use oss || myconf="${myconf} --without-oss" @@ -32,7 +32,9 @@ src_compile() { src_install () { make DESTDIR="${D}" install || die "make install failed" dodoc AUTHORS ChangeLog NEWS README TODO +} - # the binary was renamed to mocp in version 2 - dosym /usr/bin/mocp /usr/bin/moc +pkg_postinst() { + einfo "The binary was renamed due to conflicts with moc" + einfo "from the QT project. Its new name is mocp." } diff --git a/media-sound/moc/moc-2.2.0.ebuild b/media-sound/moc/moc-2.2.0-r1.ebuild index 799aca9b73fe..19e8bf59e963 100644 --- a/media-sound/moc/moc-2.2.0.ebuild +++ b/media-sound/moc/moc-2.2.0-r1.ebuild @@ -1,8 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.2.0.ebuild,v 1.2 2005/03/29 10:54:06 luckyduck Exp $ - -IUSE="flac mad oggvorbis oss" +# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.2.0-r1.ebuild,v 1.1 2005/04/18 19:13:29 luckyduck Exp $ inherit eutils @@ -13,19 +11,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" SLOT="0" LICENSE="GPL-2" KEYWORDS="~amd64 ~sparc ~x86" +IUSE="flac mad oss vorbis" DEPEND="media-libs/libao media-libs/libsndfile sys-libs/ncurses flac? ( media-libs/flac ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag ) - oggvorbis? ( media-libs/libvorbis )" + vorbis? ( media-libs/libvorbis )" src_compile() { local myconf use flac || myconf="${myconf} --without-flac" use mad || myconf="${myconf} --without-mp3" - use oggvorbis || myconf="--without-ogg" + use vorbis || myconf="--without-ogg" use oss || myconf="${myconf} --without-oss" econf ${myconf} || die "./configure failed" @@ -35,7 +34,9 @@ src_compile() { src_install () { make DESTDIR="${D}" install || die "make install failed" dodoc AUTHORS ChangeLog NEWS README TODO +} - # the binary was renamed to mocp in version 2 - dosym /usr/bin/mocp /usr/bin/moc +pkg_postinst() { + einfo "The binary was renamed due to conflicts with moc" + einfo "from the QT project. Its new name is mocp." } |