diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-07 16:00:39 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-07 16:00:39 +0000 |
commit | d8ad6274dfbaad73b5ecbdd4d9cc808962d9c76a (patch) | |
tree | 6cc86eeecbf9d2628dfc2acf07e3e623d4ee3fbe /app-cdr/cdrkit | |
parent | Stable for HPPA (bug #294147). (diff) | |
download | gentoo-2-d8ad6274dfbaad73b5ecbdd4d9cc808962d9c76a.tar.gz gentoo-2-d8ad6274dfbaad73b5ecbdd4d9cc808962d9c76a.tar.bz2 gentoo-2-d8ad6274dfbaad73b5ecbdd4d9cc808962d9c76a.zip |
old
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr/cdrkit')
-rw-r--r-- | app-cdr/cdrkit/Manifest | 3 | ||||
-rw-r--r-- | app-cdr/cdrkit/cdrkit-1.1.9-r1.ebuild | 54 | ||||
-rw-r--r-- | app-cdr/cdrkit/files/cdrkit-1.1.9-glibc-2.10.patch | 143 |
3 files changed, 0 insertions, 200 deletions
diff --git a/app-cdr/cdrkit/Manifest b/app-cdr/cdrkit/Manifest index b7725619756f..2d58ceed0eb3 100644 --- a/app-cdr/cdrkit/Manifest +++ b/app-cdr/cdrkit/Manifest @@ -1,7 +1,4 @@ -AUX cdrkit-1.1.9-glibc-2.10.patch 5775 RMD160 2e7edb07f71e0b9cf02ccfabfddabda04d47b687 SHA1 a08705d5bdb9da5aad5799099ac58e605e41b941 SHA256 568204ab5b376d1d062798a1bbd943f8fb2f807480f9d8c782a902caf1f0be7b -DIST cdrkit-1.1.9.tar.gz 1430065 RMD160 ce3c62b98c82f3d524a345a6360d24e1d7ac73d7 SHA1 44c9d85c300803e6b9a415e79f3f0c9ddf1a65ee SHA256 d5d58ab4c7bef036a53ef9742b4e57621f61310cd0cd28f558ba0b88c354efa2 DIST cdrkit_1.1.10.orig.tar.gz 1443493 RMD160 5eb098ddb98bc4e55b694131aa1ffe193a2160ae SHA1 37f35c0cb3180bbe56efc37bbf7bc82df39447c4 SHA256 8b6e90b4068cac6f3a75a501d7a85aba6583b2dc34f434e3eb62d29104b107e5 EBUILD cdrkit-1.1.10.ebuild 1621 RMD160 e7293010343dfae3ee099e571e3b39acde50b175 SHA1 c23c502913f558f0299b2cdddcabcbcccb611d99 SHA256 d3cbb86e52da3b9b5688e4691e378577478d507dc64ffb2a775cb2f999b0631a -EBUILD cdrkit-1.1.9-r1.ebuild 1661 RMD160 f47bae466fb30c52a42302c012175368b0e4e5c9 SHA1 990a4b5e92ba3a0c602d185c92e502ce3611839c SHA256 8804e5bc5566e2c159ec4fb15a97d31742537ffa727cb569f20a541a4aa1dd9f MISC ChangeLog 10038 RMD160 1707c16a9d81a0efd89eedc10eeefbccf6c6de56 SHA1 ea8f7a82212224b2f072a05ecff0eb8cad8d58a7 SHA256 cd492f6331ebd282e6a253ad4da4eea5aae83c9c5b11bcec1cd3cf3a4a6328c4 MISC metadata.xml 247 RMD160 f3cc383d1015158a8bfe1b6efd3586fa89a95345 SHA1 47a345bfa35d34381b88e9a8770cbe35a24c1476 SHA256 4d18b2a7e3f3237d29a2ea874c71c66abcda946f15bb7e15fa7cfc1d33731a24 diff --git a/app-cdr/cdrkit/cdrkit-1.1.9-r1.ebuild b/app-cdr/cdrkit/cdrkit-1.1.9-r1.ebuild deleted file mode 100644 index cf74f58e6f3c..000000000000 --- a/app-cdr/cdrkit/cdrkit-1.1.9-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.9-r1.ebuild,v 1.10 2009/10/15 20:14:00 armin76 Exp $ - -inherit cmake-utils - -DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord" -HOMEPAGE="http://cdrkit.org" -SRC_URI="http://cdrkit.org/releases/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd" -IUSE="hfs unicode kernel_linux" - -RDEPEND="unicode? ( virtual/libiconv ) - kernel_linux? ( sys-libs/libcap )" -DEPEND="${RDEPEND} - !app-cdr/cdrtools - hfs? ( sys-apps/file )" - -PATCHES=( "${FILESDIR}/${P}-glibc-2.10.patch" ) - -src_install() { - cmake-utils_src_install - - local msuffix=$(ecompress --suffix) - - dosym wodim /usr/bin/cdrecord || die - dosym genisoimage /usr/bin/mkisofs || die - dosym icedax /usr/bin/cdda2wav || die - dosym readom /usr/bin/readcd || die - dosym wodim.1${msuffix} /usr/share/man/man1/cdrecord.1${msuffix} - dosym genisoimage.1${msuffix} /usr/share/man/man1/mkisofs.1${msuffix} - dosym icedax.1${msuffix} /usr/share/man/man1/cdda2wav.1${msuffix} - dosym readom.1${msuffix} /usr/share/man/man1/readcd.1${msuffix} - - dodoc ABOUT Changelog FAQ FORK TODO doc/{PORTABILITY,WHY} - - for x in genisoimage plattforms wodim icedax; do - docinto ${x} - dodoc doc/${x}/* - done - - insinto /etc - newins wodim/wodim.dfl wodim.conf || die - newins netscsid/netscsid.dfl netscsid.conf || die - - insinto /usr/include/scsilib - doins include/*.h || die - insinto /usr/include/scsilib/usal - doins include/usal/*.h || die - dosym usal /usr/include/scsilib/scg || die -} diff --git a/app-cdr/cdrkit/files/cdrkit-1.1.9-glibc-2.10.patch b/app-cdr/cdrkit/files/cdrkit-1.1.9-glibc-2.10.patch deleted file mode 100644 index 9e2f5082a3e9..000000000000 --- a/app-cdr/cdrkit/files/cdrkit-1.1.9-glibc-2.10.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff -puNr cdrkit-1.1.9.orig/include/schily.h cdrkit-1.1.9/include/schily.h ---- cdrkit-1.1.9.orig/include/schily.h 2006-11-25 01:20:20.000000000 +0100 -+++ cdrkit-1.1.9/include/schily.h 2009-03-11 20:31:53.000000000 +0100 -@@ -116,7 +116,7 @@ extern int fexecl(const char *, FILE *, - extern int fexecle(const char *, FILE *, FILE *, FILE *, const char *, ...); - /* 6th arg not const, fexecv forces av[ac] = NULL */ - extern int fexecv(const char *, FILE *, FILE *, FILE *, int, char **); --extern int fexecve(const char *, FILE *, FILE *, FILE *, char * const *, -+extern int f_execve(const char *, FILE *, FILE *, FILE *, char * const *, - char * const *); - extern int fspawnv(FILE *, FILE *, FILE *, int, char * const *); - extern int fspawnl(FILE *, FILE *, FILE *, const char *, const char *, ...); -@@ -190,7 +190,7 @@ extern int schily_error(const char *, .. - extern char *fillbytes(void *, int, char); - extern char *findbytes(const void *, int, char); - extern int findline(const char *, char, const char *, int, char **, int); --extern int getline(char *, int); -+extern int get_line(char *, int); - extern int getstr(char *, int); - extern int breakline(char *, char, char **, int); - extern int getallargs(int *, char * const**, const char *, ...); -diff -puNr cdrkit-1.1.9.orig/librols/fexec.c cdrkit-1.1.9/librols/fexec.c ---- cdrkit-1.1.9.orig/librols/fexec.c 2008-02-25 12:14:07.000000000 +0100 -+++ cdrkit-1.1.9/librols/fexec.c 2009-03-11 20:31:53.000000000 +0100 -@@ -170,7 +170,7 @@ fexecle(name, in, out, err, va_alist) - } while (p != NULL); - va_end(args); - -- ret = fexecve(name, in, out, err, av, env); -+ ret = f_execve(name, in, out, err, av, env); - if (av != xav) - free(av); - return (ret); -@@ -184,11 +184,11 @@ fexecv(name, in, out, err, ac, av) - char *av[]; - { - av[ac] = NULL; /* force list to be null terminated */ -- return (fexecve(name, in, out, err, av, environ)); -+ return (f_execve(name, in, out, err, av, environ)); - } - - EXPORT int --fexecve(name, in, out, err, av, env) -+f_execve(name, in, out, err, av, env) - const char *name; - FILE *in, *out, *err; - char * const av[], * const env[]; -diff -puNr cdrkit-1.1.9.orig/librols/stdio/fgetline.c cdrkit-1.1.9/librols/stdio/fgetline.c ---- cdrkit-1.1.9.orig/librols/stdio/fgetline.c 2006-09-05 10:39:04.000000000 +0200 -+++ cdrkit-1.1.9/librols/stdio/fgetline.c 2009-03-11 20:31:53.000000000 +0100 -@@ -76,7 +76,7 @@ fgetline(f, buf, len) - } - - EXPORT int --getline(buf, len) -+get_line(buf, len) - char *buf; - int len; - { -diff -puNr cdrkit-1.1.9.orig/libusal/scsitransp.c cdrkit-1.1.9/libusal/scsitransp.c ---- cdrkit-1.1.9.orig/libusal/scsitransp.c 2008-02-25 12:14:07.000000000 +0100 -+++ cdrkit-1.1.9/libusal/scsitransp.c 2009-03-11 20:31:53.000000000 +0100 -@@ -301,7 +301,7 @@ usal_yes(char *msg) - - printf("%s", msg); - flush(); -- if (getline(okbuf, sizeof (okbuf)) == EOF) -+ if (get_line(okbuf, sizeof (okbuf)) == EOF) - exit(EX_BAD); - if (streql(okbuf, "y") || streql(okbuf, "yes") || - streql(okbuf, "Y") || streql(okbuf, "YES")) -diff -puNr cdrkit-1.1.9.orig/readom/io.c cdrkit-1.1.9/readom/io.c ---- cdrkit-1.1.9.orig/readom/io.c 2006-12-08 14:38:43.000000000 +0100 -+++ cdrkit-1.1.9/readom/io.c 2009-03-11 20:31:53.000000000 +0100 -@@ -130,7 +130,7 @@ BOOL getvalue(char *s, long *lp, long mi - (*prt)(s, *lp, mini, maxi, dp); - flush(); - line[0] = '\0'; -- if (getline(line, 80) == EOF) -+ if (get_line(line, 80) == EOF) - exit(EX_BAD); - - linep = skipwhite(line); -@@ -178,7 +178,7 @@ again: - vprintf(form, args); - va_end(args); - flush(); -- if (getline(okbuf, sizeof(okbuf)) == EOF) -+ if (get_line(okbuf, sizeof(okbuf)) == EOF) - exit(EX_BAD); - if (okbuf[0] == '?') { - printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n"); -diff -puNr cdrkit-1.1.9.orig/readom/readom.c cdrkit-1.1.9/readom/readom.c ---- cdrkit-1.1.9.orig/readom/readom.c 2007-04-03 00:43:29.000000000 +0200 -+++ cdrkit-1.1.9/readom/readom.c 2009-03-11 20:31:53.000000000 +0100 -@@ -1605,7 +1605,7 @@ read_generic(SCSI *usalp, parm_t *parmp, - fprintf(stderr, "Copy from SCSI (%d,%d,%d) disk to file\n", - usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp)); - fprintf(stderr, "Enter filename [%s]: ", defname); flush(); -- (void) getline(filename, sizeof (filename)); -+ (void) get_line(filename, sizeof (filename)); - } - - if (askrange) { -@@ -1772,7 +1772,7 @@ write_disk(SCSI *usalp, parm_t *parmp) - fprintf(stderr, "Copy from file to SCSI (%d,%d,%d) disk\n", - usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp)); - fprintf(stderr, "Enter filename [%s]: ", defname); flush(); -- (void) getline(filename, sizeof (filename)); -+ (void) get_line(filename, sizeof (filename)); - fprintf(stderr, "Notice: reading from file always starts at file offset 0.\n"); - - getlong("Enter starting sector for copy:", &addr, 0L, end-1); -diff -puNr cdrkit-1.1.9.orig/wodim/cue.c cdrkit-1.1.9/wodim/cue.c ---- cdrkit-1.1.9.orig/wodim/cue.c 2006-12-08 14:38:43.000000000 +0100 -+++ cdrkit-1.1.9/wodim/cue.c 2009-03-11 20:32:18.000000000 +0100 -@@ -253,7 +253,7 @@ static char *skipwhite(const char *s); - static char *peekword(void); - static char *lineend(void); - static char *markword(char *delim); --static char getdelim(void); -+static char get_delim(void); - static char *getnextitem(char *delim); - static char *neednextitem(char *delim); - static char *nextword(void); -@@ -746,7 +746,7 @@ parse_track(track_t trackp[], state_t *s - if (kp == NULL) - cueabort("Unknown filetype '%s'", word); - -- if (getdelim() == '/') { -+ if (get_delim() == '/') { - word = needitem(); - if (*astol(++word, &secsize) != '\0') - cueabort("Not a number '%s'", word); -@@ -1128,7 +1128,7 @@ linelen--; - } - - static char --getdelim() -+get_delim() - { - return (wordendc); - } |