diff options
| -rw-r--r-- | x11-misc/xrootconsole/ChangeLog | 11 | ||||
| -rw-r--r-- | x11-misc/xrootconsole/Manifest | 21 | ||||
| -rw-r--r-- | x11-misc/xrootconsole/files/digest-xrootconsole-0.4 | 1 | ||||
| -rw-r--r-- | x11-misc/xrootconsole/files/digest-xrootconsole-0.6 | 1 | ||||
| -rw-r--r-- | x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch | 12 | ||||
| -rw-r--r-- | x11-misc/xrootconsole/files/xrootconsole-0.6.manpage.patch | 22 | ||||
| -rw-r--r-- | x11-misc/xrootconsole/files/xrootconsole-0.6.noversion.patch | 52 | ||||
| -rw-r--r-- | x11-misc/xrootconsole/xrootconsole-0.4.ebuild | 23 | ||||
| -rw-r--r-- | x11-misc/xrootconsole/xrootconsole-0.6.ebuild | 33 |
9 files changed, 142 insertions, 34 deletions
diff --git a/x11-misc/xrootconsole/ChangeLog b/x11-misc/xrootconsole/ChangeLog index 80a51910dc05..af2a53d6fa29 100644 --- a/x11-misc/xrootconsole/ChangeLog +++ b/x11-misc/xrootconsole/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for x11-misc/xrootconsole # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrootconsole/ChangeLog,v 1.17 2005/03/08 16:58:46 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrootconsole/ChangeLog,v 1.18 2005/06/16 23:55:59 smithj Exp $ + +*xrootconsole-0.6 (16 Jun 2005) + + 16 Jun 2005; Jonathan Smith <smithj@gentoo.org> + +files/xrootconsole-0.6.makefile.patch, + +files/xrootconsole-0.6.manpage.patch, + +files/xrootconsole-0.6.noversion.patch, -xrootconsole-0.4.ebuild, + +xrootconsole-0.6.ebuild: + version bump for #84271 08 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> xrootconsole-0.4-r1.ebuild: diff --git a/x11-misc/xrootconsole/Manifest b/x11-misc/xrootconsole/Manifest index d20d65b0cb9d..6e9c57ea6d0f 100644 --- a/x11-misc/xrootconsole/Manifest +++ b/x11-misc/xrootconsole/Manifest @@ -1,17 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 ce4eef4854d332fb36be7ae97a26066d xrootconsole-0.4.ebuild 631 -MD5 78b8ce35b14e95c0cf012fddf5b11e3e xrootconsole-0.4-r1.ebuild 707 -MD5 953cb31d2e2d90a1dcc01bbe3ba0da2f ChangeLog 1854 +MD5 90d797fb35d00a9eae40f99d23d59180 ChangeLog 2141 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166 -MD5 9130183d87016da6b4a53355f5c130d9 files/xrootconsole-0.4.parse-color.patch 840 +MD5 78b8ce35b14e95c0cf012fddf5b11e3e xrootconsole-0.4-r1.ebuild 707 +MD5 b34b39ff7cafc75c048f1a7fa310baac xrootconsole-0.6.ebuild 839 MD5 33a1c8a9645fbd7f65d7d85a8fb207cd files/digest-xrootconsole-0.4-r1 67 -MD5 33a1c8a9645fbd7f65d7d85a8fb207cd files/digest-xrootconsole-0.4 67 +MD5 9130183d87016da6b4a53355f5c130d9 files/xrootconsole-0.4.parse-color.patch 840 +MD5 aa887531767ed413d4aa78621cfab147 files/xrootconsole-0.6.makefile.patch 323 +MD5 1957c49e36945b871087b5a57cc48dc6 files/xrootconsole-0.6.manpage.patch 1034 +MD5 c2c648b90b678a3fd48da14587c19ff2 files/xrootconsole-0.6.noversion.patch 1776 +MD5 f2e59d47ba386ca64ee01f606b94a4a0 files/digest-xrootconsole-0.6 67 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) +Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCLdnS06ebR+OMO78RAk3XAJ90OgHds+tr4kc9bPu3HrqZRETaqQCfUhkn -jradUKf4uS2NpysGD8+CF2E= -=+GYq +iD8DBQFCshG1l5AvwDPiUowRAks9AJ4jPIaa/7kJgif4ASsM7UXB1sjSmQCfYexR +dCYQwdpn4+wtNi/9PTqW4dg= +=Qok1 -----END PGP SIGNATURE----- diff --git a/x11-misc/xrootconsole/files/digest-xrootconsole-0.4 b/x11-misc/xrootconsole/files/digest-xrootconsole-0.4 deleted file mode 100644 index 461eaa33aea4..000000000000 --- a/x11-misc/xrootconsole/files/digest-xrootconsole-0.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 528feb9dd856712fd022ba0a5b586129 xrootconsole-0.4.tar.gz 15397 diff --git a/x11-misc/xrootconsole/files/digest-xrootconsole-0.6 b/x11-misc/xrootconsole/files/digest-xrootconsole-0.6 new file mode 100644 index 000000000000..151997cf0fd6 --- /dev/null +++ b/x11-misc/xrootconsole/files/digest-xrootconsole-0.6 @@ -0,0 +1 @@ +MD5 c3570d420eb5ae9f98385bc48c636fc4 xrootconsole-0.6.tar.gz 15951 diff --git a/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch b/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch new file mode 100644 index 000000000000..ce74eb115e96 --- /dev/null +++ b/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch @@ -0,0 +1,12 @@ +--- Makefile.orig 2005-03-06 16:46:36.325616480 +0900 ++++ Makefile 2005-03-06 16:46:55.140756144 +0900 +@@ -76,5 +76,7 @@ + rm -f $(EXEC) *.o core *~ + + install: $(EXEC) +- cp $(EXEC) $(BINDIR) +- cp $(MANFILE) $(MANDIR) ++ install -d $(BINDIR) ++ install -d $(MANDIR) ++ install $(EXEC) $(BINDIR) ++ install $(MANFILE) $(MANDIR) diff --git a/x11-misc/xrootconsole/files/xrootconsole-0.6.manpage.patch b/x11-misc/xrootconsole/files/xrootconsole-0.6.manpage.patch new file mode 100644 index 000000000000..55718f222383 --- /dev/null +++ b/x11-misc/xrootconsole/files/xrootconsole-0.6.manpage.patch @@ -0,0 +1,22 @@ +--- xrootconsole.1.orig 2005-03-06 16:59:05.837673328 +0900 ++++ xrootconsole.1 2005-03-06 17:04:36.493406016 +0900 +@@ -38,6 +38,9 @@ + .Ar number + columns wide. Text is written vertically down each column in the order in + which text is received from the input file. The default is 1. ++.It Fl -solid ++This option makes the background a solid color. The default is to use a ++shaded/transparent background. + .It Fl -topdown + Forces xrootconsole to display new lines from its input at the top of the + screen, scrolling previous lines down. Default behavior is to insert new +@@ -45,6 +48,9 @@ + .It Fl -wrap + Rather than truncating long lines, this option specifies that xrootconsole + should wrap excess text to the following line or lines, as necessary. ++.It Fl -noversion ++Tells xrootconsole not to display its version as the first line of output in ++the root window. Default behavior is to include version information. + .It Fl geometry Ar geometry + This option specifies the preferred size and position of the window; see + .Xr X 1 . diff --git a/x11-misc/xrootconsole/files/xrootconsole-0.6.noversion.patch b/x11-misc/xrootconsole/files/xrootconsole-0.6.noversion.patch new file mode 100644 index 000000000000..b1ede4023113 --- /dev/null +++ b/x11-misc/xrootconsole/files/xrootconsole-0.6.noversion.patch @@ -0,0 +1,52 @@ +--- main.c.orig 2004-02-21 07:31:53.000000000 +0900 ++++ main.c 2005-03-06 16:34:27.949346504 +0900 +@@ -68,6 +68,7 @@ + " --solid make background a solid color, not shaded-transparent\n" \ + " --topdown insert lines at the top and scroll the rest down\n" \ + " --wrap wrap long lines, instead of cutting them off\n" \ ++" --noversion do not display xrootwindow version in output\n" \ + " -h or --help a familiar-looking help screen\n" \ + " -v or --version displays the version number\n" \ + " [console] filename to read (defaults to standard input)\n" \ +@@ -102,6 +103,7 @@ + int wrap; + int topdown; + int solid; ++ int show_version; + } InitOptions; + + typedef struct { +@@ -219,6 +221,7 @@ + io->wrap = DEFAULT_WRAP; + io->topdown = DEFAULT_TOPDOWN; + io->solid = DEFAULT_SOLID; ++ io->show_version = 1; + + /* Process command-line arguments */ + while (*++argv != NULL) { +@@ -236,6 +239,8 @@ + io->bw = atoi(*++argv); + else if (!strcmp(*argv, "-columns") || !strcmp(*argv, "-c")) + io->tc = atoi(*++argv); ++ else if (!strcmp(*argv, "--noversion")) ++ io->show_version = 0; + else if (!strcmp(*argv, "--solid")) + io->solid = True; + else if (!strcmp(*argv, "--wrap")) +@@ -560,10 +565,12 @@ + init_console(io.console_name, ws.colwidth, ws.nlines, &cs); + + /* Display a message */ +- put("xrootconsole ",&io,&ws,&cs); +- put(XROOTCONSOLE_VERSION,&io,&ws,&cs); +- put("\n",&io,&ws,&cs); +- ++ if (io.show_version) { ++ put("xrootconsole ",&io,&ws,&cs); ++ put(XROOTCONSOLE_VERSION,&io,&ws,&cs); ++ put("\n",&io,&ws,&cs); ++ } ++ + draw_pixmap(&io,&ws,&cs); + + event_loop(&io,&ws,&cs); diff --git a/x11-misc/xrootconsole/xrootconsole-0.4.ebuild b/x11-misc/xrootconsole/xrootconsole-0.4.ebuild deleted file mode 100644 index 8b851247f9ae..000000000000 --- a/x11-misc/xrootconsole/xrootconsole-0.4.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrootconsole/xrootconsole-0.4.ebuild,v 1.14 2005/01/21 22:08:01 pylon Exp $ - -DESCRIPTION="A utility that displays its input in a text box on your root window" -HOMEPAGE="http://de-fac.to/bob/xrootconsole/" -SRC_URI="http://de-fac.to/bob/xrootconsole/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 sparc " -IUSE="" - -DEPEND="virtual/x11" - -src_compile() { - emake || die "emake failed" -} - -src_install() { - dodir /usr/bin - make BINDIR=${D}usr/bin/ install || die "install failed" -} diff --git a/x11-misc/xrootconsole/xrootconsole-0.6.ebuild b/x11-misc/xrootconsole/xrootconsole-0.6.ebuild new file mode 100644 index 000000000000..ff01080f5d88 --- /dev/null +++ b/x11-misc/xrootconsole/xrootconsole-0.6.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrootconsole/xrootconsole-0.6.ebuild,v 1.1 2005/06/16 23:55:59 smithj Exp $ + +inherit eutils + +DESCRIPTION="A utility that displays its input in a text box on your root window" +HOMEPAGE="http://de-fac.to/book/view/17" +SRC_URI="mirror://sourceforge/xrootconsole/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~sparc ~ppc ~amd64" +IUSE="" + +DEPEND="virtual/x11" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}.noversion.patch + epatch ${FILESDIR}/${P}.makefile.patch + epatch ${FILESDIR}/${P}.manpage.patch +} + +src_compile() { + emake || die "emake failed" +} + +src_install() { + dodir /usr/bin + make MANDIR=${D}usr/man/man1 BINDIR=${D}usr/bin/ install || die "install failed" +} |