public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/emacs:master commit in: www-client/conkeror/, www-client/conkeror/files/
@ 2014-01-21  9:37 Ulrich Müller
  0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Müller @ 2014-01-21  9:37 UTC (permalink / raw
  To: gentoo-commits

commit:     834078a9b1f289bcf42a4677c28822352a21f56c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 21 09:37:51 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 09:37:51 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=834078a9

Copied from Portage tree. Fixes for live ebuild contributed by Jauhien Piatlicki <piatlicki <AT> gmail.com> in bug 497024.

Package-Manager: portage-2.2.8-r1

---
 www-client/conkeror/ChangeLog              | 31 ++++++++++++++++
 www-client/conkeror/Manifest               |  1 +
 www-client/conkeror/conkeror-9999.ebuild   | 57 ++++++++++++++++++++++++++++++
 www-client/conkeror/files/conkeror.desktop | 14 ++++++++
 www-client/conkeror/files/conkeror.sh      | 12 +++++++
 www-client/conkeror/metadata.xml           | 20 +++++++++++
 6 files changed, 135 insertions(+)

diff --git a/www-client/conkeror/ChangeLog b/www-client/conkeror/ChangeLog
new file mode 100644
index 0000000..172e6c9
--- /dev/null
+++ b/www-client/conkeror/ChangeLog
@@ -0,0 +1,31 @@
+# ChangeLog for www-client/conkeror
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  21 Jan 2014; Ulrich Müller <ulm@gentoo.org> +conkeror-9999.ebuild,
+  +files/conkeror.desktop, +files/conkeror.sh, +metadata.xml:
+  Copied from Portage tree. Fixes for live ebuild contributed by
+  Jauhien Piatlicki <piatlicki@gmail.com> in bug 497024.
+
+  09 Apr 2009; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
+  Update herd in metadata.
+
+*conkeror-0.9_pre20090401 (07 Apr 2009)
+
+  07 Apr 2009; Ulrich Mueller <ulm@gentoo.org>
+  +conkeror-0.9_pre20090401.ebuild:
+  Add ebuild for upstream snapshot.
+
+  10 Feb 2009; Ulrich Mueller <ulm@gentoo.org> +files/conkeror.desktop,
+  conkeror-9999.ebuild:
+  Also install "help", "style" and "tests" subdirectories. Add desktop entry.
+
+  05 Sep 2008; Christian Faulhammer <opfer@gentoo.org> conkeror-9999.ebuild:
+  add a DESCRIPTION
+
+*conkeror-9999 (05 Sep 2008)
+
+  05 Sep 2008; Ulrich Mueller <ulm@gentoo.org> +metadata.xml,
+  +conkeror-9999.ebuild:
+  Initial import, work in progress. Ebuild contributed by me.
+

diff --git a/www-client/conkeror/Manifest b/www-client/conkeror/Manifest
new file mode 100644
index 0000000..cd1bc77
--- /dev/null
+++ b/www-client/conkeror/Manifest
@@ -0,0 +1 @@
+DIST conkeror.png 5105 SHA256 b11856c32bdec9e9b045df44aa37727f6a3ec18507d376bf27675bc7ee042667 SHA512 fd44e2732a74ab6a54ef4a946f20619aa74d24d2244b0d6bedfa6d4680bc3247d297565550d8c3a5cc4a8ca608761ccb8f61e71cbe0c2851d400f8fa426e034f WHIRLPOOL 3fe3ea1f7f1caaa737ed3777b6b8cb6e10f971b5853a0a89de65c78e75323e8f01f01ea46d01fbff47dd97452e7a114b353322b4d8764a4d2bacf755c8fa3c66

diff --git a/www-client/conkeror/conkeror-9999.ebuild b/www-client/conkeror/conkeror-9999.ebuild
new file mode 100644
index 0000000..c9b543e
--- /dev/null
+++ b/www-client/conkeror/conkeror-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EGIT_REPO_URI="git://repo.or.cz/conkeror.git"
+EGIT_BRANCH="gecko26-downloads-fix"
+
+inherit eutils git-r3 toolchain-funcs fdo-mime
+
+DESCRIPTION="A Mozilla-based web browser whose design is inspired by GNU Emacs"
+HOMEPAGE="http://conkeror.org/"
+# conkeror.png is derived from http://commons.wikimedia.org/wiki/File:Conker.jpg
+SRC_URI="http://dev.gentoo.org/~ulm/distfiles/conkeror.png"
+
+# CC-BY-SA-3.0 for conkeror.png
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0"
+SLOT="0"
+
+RDEPEND="|| ( >=www-client/firefox-5.0 >=www-client/firefox-bin-23.0 )"
+
+src_unpack() {
+	git-r3_src_unpack
+	cp "${DISTDIR}/conkeror.png" . || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r branding chrome components content defaults help locale modules \
+		search-engines style tests
+	doins application.ini *.manifest Info.plist
+
+	exeinto /usr/libexec/${PN}
+	doexe conkeror-spawn-helper
+	dosym ../../libexec/${PN}/conkeror-spawn-helper \
+		/usr/share/${PN}/conkeror-spawn-helper
+
+	newbin "${FILESDIR}/conkeror.sh" conkeror
+	domenu "${FILESDIR}/conkeror.desktop"
+	doicon "${WORKDIR}/conkeror.png"
+
+	doman contrib/man/conkeror.1
+	dodoc CREDITS
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}

diff --git a/www-client/conkeror/files/conkeror.desktop b/www-client/conkeror/files/conkeror.desktop
new file mode 100644
index 0000000..fcf6123
--- /dev/null
+++ b/www-client/conkeror/files/conkeror.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Conkeror
+GenericName=Web Browser
+Comment=Conkeror is a Mozilla-based web browser whose design is inspired by GNU Emacs
+Icon=conkeror
+TryExec=/usr/bin/conkeror
+Exec=/usr/bin/conkeror %u
+Terminal=false
+Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;
+StartupNotify=true
+StartupWMClass=Conkeror

diff --git a/www-client/conkeror/files/conkeror.sh b/www-client/conkeror/files/conkeror.sh
new file mode 100644
index 0000000..e00077b
--- /dev/null
+++ b/www-client/conkeror/files/conkeror.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+# Wrapper script for conkeror
+
+for cmd in firefox firefox-bin; do
+    xr=$(type -p ${cmd})
+    if [[ -n ${xr} ]]; then
+ 	exec "${xr}" -app /usr/share/conkeror/application.ini "$@"
+    fi
+done
+
+echo "$0: firefox required, but not found." >&2
+exit 1

diff --git a/www-client/conkeror/metadata.xml b/www-client/conkeror/metadata.xml
new file mode 100644
index 0000000..f8e5d58
--- /dev/null
+++ b/www-client/conkeror/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>fauli@gentoo.org</email>
+  <name>Christian Faulhammer</name>
+</maintainer>
+<maintainer>
+  <email>ulm@gentoo.org</email>
+  <name>Ulrich Müller</name>
+</maintainer>
+<longdescription>
+  Conkeror is a keyboard-oriented, highly-customizable, highly-extensible
+  web browser based on Mozilla XULRunner, written mainly in JavaScript, and
+  inspired by exceptional software such as Emacs and vi. Conkeror features a
+  sophisticated keyboard system, allowing users to run commands and interact
+  with content in powerful and novel ways, and it is self-documenting,
+  featuring a powerful interactive help system.
+</longdescription>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] proj/emacs:master commit in: www-client/conkeror/, www-client/conkeror/files/
@ 2014-02-13 22:22 Ulrich Müller
  0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Müller @ 2014-02-13 22:22 UTC (permalink / raw
  To: gentoo-commits

commit:     0d69e182c6065d3d1546c322d79d8bbe133be97b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 22:26:24 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 22:26:24 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=0d69e182

conkeror moved to my dev overlay: git://git.overlays.gentoo.org/dev/ulm.git

---
 www-client/conkeror/ChangeLog              | 31 ----------------
 www-client/conkeror/Manifest               |  1 -
 www-client/conkeror/conkeror-9999.ebuild   | 57 ------------------------------
 www-client/conkeror/files/conkeror.desktop | 14 --------
 www-client/conkeror/files/conkeror.sh      | 12 -------
 www-client/conkeror/metadata.xml           | 20 -----------
 6 files changed, 135 deletions(-)

diff --git a/www-client/conkeror/ChangeLog b/www-client/conkeror/ChangeLog
deleted file mode 100644
index 172e6c9..0000000
--- a/www-client/conkeror/ChangeLog
+++ /dev/null
@@ -1,31 +0,0 @@
-# ChangeLog for www-client/conkeror
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  21 Jan 2014; Ulrich Müller <ulm@gentoo.org> +conkeror-9999.ebuild,
-  +files/conkeror.desktop, +files/conkeror.sh, +metadata.xml:
-  Copied from Portage tree. Fixes for live ebuild contributed by
-  Jauhien Piatlicki <piatlicki@gmail.com> in bug 497024.
-
-  09 Apr 2009; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
-  Update herd in metadata.
-
-*conkeror-0.9_pre20090401 (07 Apr 2009)
-
-  07 Apr 2009; Ulrich Mueller <ulm@gentoo.org>
-  +conkeror-0.9_pre20090401.ebuild:
-  Add ebuild for upstream snapshot.
-
-  10 Feb 2009; Ulrich Mueller <ulm@gentoo.org> +files/conkeror.desktop,
-  conkeror-9999.ebuild:
-  Also install "help", "style" and "tests" subdirectories. Add desktop entry.
-
-  05 Sep 2008; Christian Faulhammer <opfer@gentoo.org> conkeror-9999.ebuild:
-  add a DESCRIPTION
-
-*conkeror-9999 (05 Sep 2008)
-
-  05 Sep 2008; Ulrich Mueller <ulm@gentoo.org> +metadata.xml,
-  +conkeror-9999.ebuild:
-  Initial import, work in progress. Ebuild contributed by me.
-

diff --git a/www-client/conkeror/Manifest b/www-client/conkeror/Manifest
deleted file mode 100644
index cd1bc77..0000000
--- a/www-client/conkeror/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST conkeror.png 5105 SHA256 b11856c32bdec9e9b045df44aa37727f6a3ec18507d376bf27675bc7ee042667 SHA512 fd44e2732a74ab6a54ef4a946f20619aa74d24d2244b0d6bedfa6d4680bc3247d297565550d8c3a5cc4a8ca608761ccb8f61e71cbe0c2851d400f8fa426e034f WHIRLPOOL 3fe3ea1f7f1caaa737ed3777b6b8cb6e10f971b5853a0a89de65c78e75323e8f01f01ea46d01fbff47dd97452e7a114b353322b4d8764a4d2bacf755c8fa3c66

diff --git a/www-client/conkeror/conkeror-9999.ebuild b/www-client/conkeror/conkeror-9999.ebuild
deleted file mode 100644
index c9b543e..0000000
--- a/www-client/conkeror/conkeror-9999.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-EGIT_REPO_URI="git://repo.or.cz/conkeror.git"
-EGIT_BRANCH="gecko26-downloads-fix"
-
-inherit eutils git-r3 toolchain-funcs fdo-mime
-
-DESCRIPTION="A Mozilla-based web browser whose design is inspired by GNU Emacs"
-HOMEPAGE="http://conkeror.org/"
-# conkeror.png is derived from http://commons.wikimedia.org/wiki/File:Conker.jpg
-SRC_URI="http://dev.gentoo.org/~ulm/distfiles/conkeror.png"
-
-# CC-BY-SA-3.0 for conkeror.png
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0"
-SLOT="0"
-
-RDEPEND="|| ( >=www-client/firefox-5.0 >=www-client/firefox-bin-23.0 )"
-
-src_unpack() {
-	git-r3_src_unpack
-	cp "${DISTDIR}/conkeror.png" . || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r branding chrome components content defaults help locale modules \
-		search-engines style tests
-	doins application.ini *.manifest Info.plist
-
-	exeinto /usr/libexec/${PN}
-	doexe conkeror-spawn-helper
-	dosym ../../libexec/${PN}/conkeror-spawn-helper \
-		/usr/share/${PN}/conkeror-spawn-helper
-
-	newbin "${FILESDIR}/conkeror.sh" conkeror
-	domenu "${FILESDIR}/conkeror.desktop"
-	doicon "${WORKDIR}/conkeror.png"
-
-	doman contrib/man/conkeror.1
-	dodoc CREDITS
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}

diff --git a/www-client/conkeror/files/conkeror.desktop b/www-client/conkeror/files/conkeror.desktop
deleted file mode 100644
index fcf6123..0000000
--- a/www-client/conkeror/files/conkeror.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Conkeror
-GenericName=Web Browser
-Comment=Conkeror is a Mozilla-based web browser whose design is inspired by GNU Emacs
-Icon=conkeror
-TryExec=/usr/bin/conkeror
-Exec=/usr/bin/conkeror %u
-Terminal=false
-Categories=Network;WebBrowser;
-MimeType=text/html;text/xml;
-StartupNotify=true
-StartupWMClass=Conkeror

diff --git a/www-client/conkeror/files/conkeror.sh b/www-client/conkeror/files/conkeror.sh
deleted file mode 100644
index e00077b..0000000
--- a/www-client/conkeror/files/conkeror.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-# Wrapper script for conkeror
-
-for cmd in firefox firefox-bin; do
-    xr=$(type -p ${cmd})
-    if [[ -n ${xr} ]]; then
- 	exec "${xr}" -app /usr/share/conkeror/application.ini "$@"
-    fi
-done
-
-echo "$0: firefox required, but not found." >&2
-exit 1

diff --git a/www-client/conkeror/metadata.xml b/www-client/conkeror/metadata.xml
deleted file mode 100644
index f8e5d58..0000000
--- a/www-client/conkeror/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
-  <email>fauli@gentoo.org</email>
-  <name>Christian Faulhammer</name>
-</maintainer>
-<maintainer>
-  <email>ulm@gentoo.org</email>
-  <name>Ulrich Müller</name>
-</maintainer>
-<longdescription>
-  Conkeror is a keyboard-oriented, highly-customizable, highly-extensible
-  web browser based on Mozilla XULRunner, written mainly in JavaScript, and
-  inspired by exceptional software such as Emacs and vi. Conkeror features a
-  sophisticated keyboard system, allowing users to run commands and interact
-  with content in powerful and novel ways, and it is self-documenting,
-  featuring a powerful interactive help system.
-</longdescription>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-02-13 22:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-21  9:37 [gentoo-commits] proj/emacs:master commit in: www-client/conkeror/, www-client/conkeror/files/ Ulrich Müller
  -- strict thread matches above, loose matches on Subject: below --
2014-02-13 22:22 Ulrich Müller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox