* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmlpq/
@ 2015-08-23 20:35 Bernard Cafarelli
0 siblings, 0 replies; 2+ messages in thread
From: Bernard Cafarelli @ 2015-08-23 20:35 UTC (permalink / raw
To: gentoo-commits
commit: ce5bec38730a1bc86a36bf1c533ee6250d4c8175
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 20:16:59 2015 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 20:35:01 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce5bec38
x11-plugins/wmlpq: EAPI bump, fix compilation with new libdockapp
Package-Manager: portage-2.2.20.1
x11-plugins/wmlpq/Manifest | 2 +-
x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild | 5 ++--
x11-plugins/wmlpq/wmlpq-0.2.1-r2.ebuild | 5 ++--
x11-plugins/wmlpq/wmlpq-0.2.1-r3.ebuild | 41 +++++++++++++++++++++++++++++++++
4 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/x11-plugins/wmlpq/Manifest b/x11-plugins/wmlpq/Manifest
index 0a81bce..79aba3c 100644
--- a/x11-plugins/wmlpq/Manifest
+++ b/x11-plugins/wmlpq/Manifest
@@ -1 +1 @@
-DIST wmlpq_0.2.1.tar.gz 15180 SHA256 6dba6ed7b61baa6060f4646a230477970dec2fd06d01dab7dbdf064bed348e83
+DIST wmlpq_0.2.1.tar.gz 15180 SHA256 6dba6ed7b61baa6060f4646a230477970dec2fd06d01dab7dbdf064bed348e83 SHA512 757dc6f63d13f4715de7acf4cd436514de96ca78f7eb0e32f156c3a5f75c59e7e9c3d300a81bc1ce8e5def8a66f7678ca7b4b77969ef62f231c9db578c91ce4a WHIRLPOOL 383eab5a697937f510557687ef110d564d7dde701a73b8f3f2d6c32c3fb3e4fe4284aeb59971f3260852a9d261fe4a8048c7b9415fe692cb867456f7f0b97e6b
diff --git a/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild b/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild
index c081a49..3f993c1 100644
--- a/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild
+++ b/x11-plugins/wmlpq/wmlpq-0.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,7 +10,8 @@ DESCRIPTION="Windowmaker dockapp which monitors up to 5 printqueues"
SRC_URI="http://www.ur.uklinux.net/wmlpq/dl/wmlpq_0.2.1.tar.gz"
HOMEPAGE="http://www.ur.uklinux.net/wmlpq/"
-DEPEND="x11-libs/libdockapp"
+DEPEND="<x11-libs/libdockapp-0.7"
+RDEPEND="${DEPEND}"
RDEPEND=""
diff --git a/x11-plugins/wmlpq/wmlpq-0.2.1-r2.ebuild b/x11-plugins/wmlpq/wmlpq-0.2.1-r2.ebuild
index 25aba7a..83515e2 100644
--- a/x11-plugins/wmlpq/wmlpq-0.2.1-r2.ebuild
+++ b/x11-plugins/wmlpq/wmlpq-0.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,7 +10,8 @@ DESCRIPTION="Windowmaker dockapp which monitors up to 5 printqueues"
SRC_URI="http://www.ur.uklinux.net/wmlpq/dl/wmlpq_0.2.1.tar.gz"
HOMEPAGE="http://www.ur.uklinux.net/wmlpq/"
-DEPEND="x11-libs/libdockapp"
+DEPEND="<x11-libs/libdockapp-0.7"
+RDEPEND="${DEPEND}"
RDEPEND=""
diff --git a/x11-plugins/wmlpq/wmlpq-0.2.1-r3.ebuild b/x11-plugins/wmlpq/wmlpq-0.2.1-r3.ebuild
new file mode 100644
index 0000000..6cb65d6
--- /dev/null
+++ b/x11-plugins/wmlpq/wmlpq-0.2.1-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Windowmaker dockapp which monitors up to 5 printqueues"
+HOMEPAGE="http://www.ur.uklinux.net/wmlpq/"
+SRC_URI="http://www.ur.uklinux.net/${PN}/dl/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=x11-libs/libdockapp-0.7:="
+RDEPEND="${DEPEND}"
+
+src_prepare()
+{
+ epatch "${FILESDIR}/${PN}-makefile-ldflags.patch"
+
+ sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
+}
+
+src_compile()
+{
+ emake CC=$(tc-getCC) LDFLAGS="${LDFLAGS}"
+}
+
+src_install()
+{
+ dodir /usr/bin
+ emake DESTDIR="${D}"/usr/bin install
+
+ dodoc README sample.wmlpqrc
+ newman wmlpq.1x wmlpq.1
+
+ domenu "${FILESDIR}/${PN}.desktop"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmlpq/
@ 2015-09-13 8:27 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2015-09-13 8:27 UTC (permalink / raw
To: gentoo-commits
commit: 40873dc4b92baa01e5749cde1d85c032c4c187cd
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 08:24:41 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 08:27:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40873dc4
x11-plugins/wmlpq: Drop version using /usr/local
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
x11-plugins/wmlpq/metadata.xml | 2 +-
x11-plugins/wmlpq/wmlpq-0.2.1-r2.ebuild | 44 ---------------------------------
x11-plugins/wmlpq/wmlpq-0.2.1-r3.ebuild | 10 +++-----
3 files changed, 5 insertions(+), 51 deletions(-)
diff --git a/x11-plugins/wmlpq/metadata.xml b/x11-plugins/wmlpq/metadata.xml
index b1a9efc..a03f5d8 100644
--- a/x11-plugins/wmlpq/metadata.xml
+++ b/x11-plugins/wmlpq/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>desktop-dock</herd>
+ <herd>desktop-dock</herd>
</pkgmetadata>
diff --git a/x11-plugins/wmlpq/wmlpq-0.2.1-r2.ebuild b/x11-plugins/wmlpq/wmlpq-0.2.1-r2.ebuild
deleted file mode 100644
index 83515e2..0000000
--- a/x11-plugins/wmlpq/wmlpq-0.2.1-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils flag-o-matic toolchain-funcs
-
-IUSE=""
-
-DESCRIPTION="Windowmaker dockapp which monitors up to 5 printqueues"
-SRC_URI="http://www.ur.uklinux.net/wmlpq/dl/wmlpq_0.2.1.tar.gz"
-HOMEPAGE="http://www.ur.uklinux.net/wmlpq/"
-
-DEPEND="<x11-libs/libdockapp-0.7"
-RDEPEND="${DEPEND}"
-
-RDEPEND=""
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86"
-
-src_unpack()
-{
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${PN}-makefile-ldflags.patch"
-}
-
-src_compile()
-{
- append-ldflags "-L/usr/X11R6/lib -L/usr/local/lib"
- emake CC=$(tc-getCC) LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install()
-{
- dodir /usr/bin || die
- emake DESTDIR="${D}/usr/bin" install || die "Installation failed"
-
- dodoc README sample.wmlpqrc || die
- newman wmlpq.1x wmlpq.1 || die
-
- domenu "${FILESDIR}/${PN}.desktop" || die
-}
diff --git a/x11-plugins/wmlpq/wmlpq-0.2.1-r3.ebuild b/x11-plugins/wmlpq/wmlpq-0.2.1-r3.ebuild
index 6cb65d6..d4e6de5 100644
--- a/x11-plugins/wmlpq/wmlpq-0.2.1-r3.ebuild
+++ b/x11-plugins/wmlpq/wmlpq-0.2.1-r3.ebuild
@@ -3,6 +3,7 @@
# $Id$
EAPI=5
+
inherit eutils flag-o-matic toolchain-funcs
DESCRIPTION="Windowmaker dockapp which monitors up to 5 printqueues"
@@ -17,20 +18,17 @@ IUSE=""
DEPEND=">=x11-libs/libdockapp-0.7:="
RDEPEND="${DEPEND}"
-src_prepare()
-{
+src_prepare() {
epatch "${FILESDIR}/${PN}-makefile-ldflags.patch"
sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
}
-src_compile()
-{
+src_compile() {
emake CC=$(tc-getCC) LDFLAGS="${LDFLAGS}"
}
-src_install()
-{
+src_install() {
dodir /usr/bin
emake DESTDIR="${D}"/usr/bin install
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-09-13 8:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-23 20:35 [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmlpq/ Bernard Cafarelli
-- strict thread matches above, loose matches on Subject: below --
2015-09-13 8:27 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox