* [gentoo-commits] dev/dev-zero:master commit in: net-print/cups-bjnp/files/, net-print/cups-bjnp/
@ 2011-02-04 16:22 dev-zero
0 siblings, 0 replies; 2+ messages in thread
From: dev-zero @ 2011-02-04 16:22 UTC (permalink / raw
To: gentoo-commits
commit: e680d3082c58612c924d23126fe5443aa19492a9
Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 4 16:22:47 2011 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Fri Feb 4 16:22:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=e680d3082c58612c924d23126fe5443aa19492a9
Version bump, backported patch to fix compilation with cups-1.3.x
---
net-print/cups-bjnp/Manifest | 5 +++--
...ps-bjnp-0.5.4.ebuild => cups-bjnp-0.5.5.ebuild} | 10 ++++++++--
.../files/0.5.5-cups-1.3.x-compile-fix.patch | 17 +++++++++++++++++
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/net-print/cups-bjnp/Manifest b/net-print/cups-bjnp/Manifest
index 482dd6f..d62eac1 100644
--- a/net-print/cups-bjnp/Manifest
+++ b/net-print/cups-bjnp/Manifest
@@ -1,2 +1,3 @@
-EBUILD cups-bjnp-0.5.4.ebuild 557 RMD160 2c2cfbb70b32868bbac596b5048aff47c2cce357 SHA1 d8ad7befdd19f02411e39246aa8a9beae8eed465 SHA256 d7add9cba54e12a658de91791ba2e7bee69c2840fc160c0635444b9eb7765fe9
-DIST cups-bjnp-0.5.4.tar.gz 140698 RMD160 a7669d132370c951ca9e8a95fea4a888b3490022 SHA1 7b74ec4b898b65018a6393f0aa86eb78394c1b91 SHA256 c6d1db090674cc8c2dd122efb1696a61d277d0bf26e7cfb627443f0974bcb6e0
+EBUILD cups-bjnp-0.5.5.ebuild 649 RMD160 1305c4bd6b3ea75f2962ed2a472ee52f4f87a2d4 SHA1 d2f7dca27d53d049c057071b82409d0dc423c57f SHA256 96539767f34a7617dfbcc7fdf13e8b68c8ed797030efe5ca5894da958031a1b8
+AUX 0.5.5-cups-1.3.x-compile-fix.patch 514 RMD160 def479115c4251f7e7b567a536d800c20d6bc3a9 SHA1 d9e98678b6a8755dcd8a0915dcac3f12e8aa3006 SHA256 5238d888a2421e158e7ffb206de7d135781a73ee3e9e17e90f454ff623d2e932
+DIST cups-bjnp-0.5.5.tar.gz 122011 RMD160 fac228e5706c9c1aab104efcd4da95e96c32a19d SHA1 ee92a655ef6fc1f2f8488f1ac6e9df778897c53f SHA256 84373d666a73de462e7edaee605d6ec2569f15505cdb060cf8931c37b2020407
diff --git a/net-print/cups-bjnp/cups-bjnp-0.5.4.ebuild b/net-print/cups-bjnp/cups-bjnp-0.5.5.ebuild
similarity index 78%
rename from net-print/cups-bjnp/cups-bjnp-0.5.4.ebuild
rename to net-print/cups-bjnp/cups-bjnp-0.5.5.ebuild
index 0241579..b5b65d1 100644
--- a/net-print/cups-bjnp/cups-bjnp-0.5.4.ebuild
+++ b/net-print/cups-bjnp/cups-bjnp-0.5.5.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Tiziano Müller
+# Copyright 1999-2011 Tiziano Müller
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI="4"
+
+inherit eutils
DESCRIPTION="CUPS backend for the canon printers using the proprietary USB over IP BJNP protocol."
HOMEPAGE="http://sourceforge.net/projects/cups-bjnp/"
@@ -16,6 +18,10 @@ IUSE=""
DEPEND="net-print/cups"
RDEPEND="${DEPEND}"
+src_prepare() {
+ epatch "${FILESDIR}/${PV}-cups-1.3.x-compile-fix.patch"
+}
+
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
diff --git a/net-print/cups-bjnp/files/0.5.5-cups-1.3.x-compile-fix.patch b/net-print/cups-bjnp/files/0.5.5-cups-1.3.x-compile-fix.patch
new file mode 100644
index 0000000..3f1bb33
--- /dev/null
+++ b/net-print/cups-bjnp/files/0.5.5-cups-1.3.x-compile-fix.patch
@@ -0,0 +1,17 @@
+Index: bjnp-runloop.c
+===================================================================
+--- bjnp-runloop.c (Revision 45)
++++ bjnp-runloop.c (Arbeitskopie)
+@@ -224,9 +224,12 @@
+ bjnp_debug (LOG_DEBUG, "Received side-channel request, command is %d\n", command);
+ switch (command)
+ {
++#ifdef CUPS_SC_CMD_NONE
+ case CUPS_SC_CMD_NONE:
++ /* this value is private, but it is received sometimes.... */
+ /* Nothing to do.... */
+ break;
++#endif
+
+ case CUPS_SC_CMD_DRAIN_OUTPUT:
+ /*
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/dev-zero:master commit in: net-print/cups-bjnp/files/, net-print/cups-bjnp/
@ 2011-11-21 6:25 Tiziano Müller
0 siblings, 0 replies; 2+ messages in thread
From: Tiziano Müller @ 2011-11-21 6:25 UTC (permalink / raw
To: gentoo-commits
commit: c99550f03d3e41c4004587bef167ed8940aefdde
Author: Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Mon Nov 21 06:20:14 2011 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 06:24:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=c99550f0
ebuild moved to tree (not by me)
---
net-print/cups-bjnp/Manifest | 3 --
net-print/cups-bjnp/cups-bjnp-0.5.5.ebuild | 29 --------------------
.../files/0.5.5-cups-1.3.x-compile-fix.patch | 17 -----------
3 files changed, 0 insertions(+), 49 deletions(-)
diff --git a/net-print/cups-bjnp/Manifest b/net-print/cups-bjnp/Manifest
deleted file mode 100644
index d62eac1..0000000
--- a/net-print/cups-bjnp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD cups-bjnp-0.5.5.ebuild 649 RMD160 1305c4bd6b3ea75f2962ed2a472ee52f4f87a2d4 SHA1 d2f7dca27d53d049c057071b82409d0dc423c57f SHA256 96539767f34a7617dfbcc7fdf13e8b68c8ed797030efe5ca5894da958031a1b8
-AUX 0.5.5-cups-1.3.x-compile-fix.patch 514 RMD160 def479115c4251f7e7b567a536d800c20d6bc3a9 SHA1 d9e98678b6a8755dcd8a0915dcac3f12e8aa3006 SHA256 5238d888a2421e158e7ffb206de7d135781a73ee3e9e17e90f454ff623d2e932
-DIST cups-bjnp-0.5.5.tar.gz 122011 RMD160 fac228e5706c9c1aab104efcd4da95e96c32a19d SHA1 ee92a655ef6fc1f2f8488f1ac6e9df778897c53f SHA256 84373d666a73de462e7edaee605d6ec2569f15505cdb060cf8931c37b2020407
diff --git a/net-print/cups-bjnp/cups-bjnp-0.5.5.ebuild b/net-print/cups-bjnp/cups-bjnp-0.5.5.ebuild
deleted file mode 100644
index b5b65d1..0000000
--- a/net-print/cups-bjnp/cups-bjnp-0.5.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Tiziano Müller
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="CUPS backend for the canon printers using the proprietary USB over IP BJNP protocol."
-HOMEPAGE="http://sourceforge.net/projects/cups-bjnp/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LPGL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}/${PV}-cups-1.3.x-compile-fix.patch"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/net-print/cups-bjnp/files/0.5.5-cups-1.3.x-compile-fix.patch b/net-print/cups-bjnp/files/0.5.5-cups-1.3.x-compile-fix.patch
deleted file mode 100644
index 3f1bb33..0000000
--- a/net-print/cups-bjnp/files/0.5.5-cups-1.3.x-compile-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: bjnp-runloop.c
-===================================================================
---- bjnp-runloop.c (Revision 45)
-+++ bjnp-runloop.c (Arbeitskopie)
-@@ -224,9 +224,12 @@
- bjnp_debug (LOG_DEBUG, "Received side-channel request, command is %d\n", command);
- switch (command)
- {
-+#ifdef CUPS_SC_CMD_NONE
- case CUPS_SC_CMD_NONE:
-+ /* this value is private, but it is received sometimes.... */
- /* Nothing to do.... */
- break;
-+#endif
-
- case CUPS_SC_CMD_DRAIN_OUTPUT:
- /*
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-21 6:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-04 16:22 [gentoo-commits] dev/dev-zero:master commit in: net-print/cups-bjnp/files/, net-print/cups-bjnp/ dev-zero
-- strict thread matches above, loose matches on Subject: below --
2011-11-21 6:25 Tiziano Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox