commit: b5d07704aa60b0210f59b1744897a2b15688fedc Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Fri Nov 24 10:03:07 2017 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Fri Nov 24 10:03:07 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d07704
x11-plugins/wmacpi: drop old Package-Manager: Portage-2.3.16, Repoman-2.3.6 x11-plugins/wmacpi/Manifest | 2 - x11-plugins/wmacpi/files/1.34-acpi.patch | 17 ------ x11-plugins/wmacpi/files/1.34-apm.patch | 17 ------ .../wmacpi/files/wmacpi-2.2_rc1-makefile.patch | 71 ---------------------- x11-plugins/wmacpi/wmacpi-1.34.ebuild | 37 ----------- x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild | 43 ------------- 6 files changed, 187 deletions(-) diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest index 62bfd77739f..bcbac8f1cde 100644 --- a/x11-plugins/wmacpi/Manifest +++ b/x11-plugins/wmacpi/Manifest @@ -1,3 +1 @@ -DIST wmacpi-1.34.tar.gz 15509 SHA256 65f7a1da06fd3489ed97391d1c9b77b570bc30c14b1f846007028353d0fa51e2 SHA512 d2e3fb2b5ba9fc4d0996262d63cf935c4fe1bfda9d04acc3aec174172551bfa97b656aa445c747c3e9c58e32d2f4b1eba69e6d8b9b754b3d9066a84277b8f286 WHIRLPOOL 67263284e36be7257dbd662b8e78714f02f16f93accbc51433ce15754e0714c8c05a6306d70028914bf18a8d7d1bbb9d516afb7ee09fdbcbffb26ea1825270a5 -DIST wmacpi-2.2rc1.tar.bz2 30233 SHA256 25fc405e6e653caf9cfd90104b184cb4ed73114e710e229ed012ec155083a11f SHA512 491709b5f0019084f6423737bbb47de4353f297f2469b72cd8eec1e93d62487db5d590235b0b774ce3828a26f6f589ddf9bf9896cfecd47249c37e6e230b739e WHIRLPOOL 7eb717cde21490e395beacacb89bb3df6bffae7f64c6a5298f955a8c68abae36fabe271d9815de4c3a45c9fa3e579dc5f46f85a6441bb566c11efaca86aa8575 DIST wmacpi-2.3.tar.gz 39374 SHA256 5ae0ae6ca447e29acaf206f2321a50207509eb2a17ccb98ed196adf734263105 SHA512 47c260989cd3fdb8d7ceadba19224e6350056741b03c6f1b73a38b06d7e471a08972dfbcaeacdcbc460bc19b0f952641eda75e11468b4d7155eecd07e1e14cd9 WHIRLPOOL 0735582a3ee47144ab6ae57a5f6095a2adb006e62b536620b1036dab9ccee4b3ef6e581fde314440398cfc622f4db1ff150ec6c64ce08e791c2559397ef7cb8d diff --git a/x11-plugins/wmacpi/files/1.34-acpi.patch b/x11-plugins/wmacpi/files/1.34-acpi.patch deleted file mode 100644 index 76a94e57f77..00000000000 --- a/x11-plugins/wmacpi/files/1.34-acpi.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- Makefile.orig 2003-09-04 13:00:48.784055072 -0400 -+++ Makefile 2003-09-04 13:03:41.399813488 -0400 -@@ -11,11 +11,11 @@ - #OPT = -pg -g -DPRO -DACPI - - CC = gcc --CFLAGS = $(OPT) -Wall -ansi -I/usr/X11R6/include -+CFLAGS = $(OPT) -Wall -ansi -I/usr/X11R6/include -DACPI - LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext - --SRCS = wmacpi.c libapm.c libacpi.c --OBJS = wmacpi.o libapm.o libacpi.o -+SRCS = wmacpi.c libacpi.c -+OBJS = wmacpi.o libacpi.o - - all: wmacpi - diff --git a/x11-plugins/wmacpi/files/1.34-apm.patch b/x11-plugins/wmacpi/files/1.34-apm.patch deleted file mode 100644 index 6b640b781b1..00000000000 --- a/x11-plugins/wmacpi/files/1.34-apm.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- Makefile.orig 2003-09-04 13:00:48.784055072 -0400 -+++ Makefile 2003-09-04 13:04:23.297444080 -0400 -@@ -11,11 +11,11 @@ - #OPT = -pg -g -DPRO -DACPI - - CC = gcc --CFLAGS = $(OPT) -Wall -ansi -I/usr/X11R6/include -+CFLAGS = $(OPT) -Wall -ansi -I/usr/X11R6/include -DAPM - LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext - --SRCS = wmacpi.c libapm.c libacpi.c --OBJS = wmacpi.o libapm.o libacpi.o -+SRCS = wmacpi.c libapm.c -+OBJS = wmacpi.o libapm.o - - all: wmacpi - diff --git a/x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch deleted file mode 100644 index af142fd574e..00000000000 --- a/x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- Makefile.orig 2007-07-13 17:26:30.000000000 +0200 -+++ Makefile 2008-01-28 16:36:41.000000000 +0100 -@@ -13,8 +13,8 @@ - #OPT = -pg -g - - CC := gcc --CFLAGS := $(OPT) -Wall -W -g -ansi -I/usr/X11R6/include --LDFLAGS := $(OPT) -lX11 -ldockapp -+CFLAGS := $(OPT) -Wall -W -g -ansi -I/usr/include -+LDFLAGS += -lX11 -ldockapp - - WMSRC := wmacpi.c libacpi.c - HEADERS := libacpi.h wmacpi.h -@@ -22,11 +22,12 @@ - doc_targets := wmacpi.1 - - ifdef BUILD_CLI --targets += acpi --doc_targets += acpi.1 -+targets += acpi-batt-status -+doc_targets += acpi-batt-status.1 - endif - --PREFIX := /usr/local -+PREFIX := /usr -+MANDIR := $(PREFIX)/share/man - - all: $(targets) - -@@ -34,20 +35,20 @@ - WMOBJ := $(patsubst %.c,%.o,$(filter %.c,$(WMSRC))) - - # include per-file dependencies ---include $(WMOBJ:.o=.d) -+#-include $(WMOBJ:.o=.d) - - wmacpi: $(WMOBJ) -- $(CC) $(LDFLAGS) -o $@ $^ -+ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) - - # for the Debian package, we want to make building the command line tools - # optional. So, we hide all the necessary stuff here . . . - ifdef BUILD_CLI --CLSRC := acpi.c libacpi.c -+CLSRC := acpi-batt-status.c libacpi.c - CLOBJ := $(patsubst %.c,%.o,$(filter %.c,$(CLSRC))) ---include $(CLOBJ:.o=.d) -+#-include $(CLOBJ:.o=.d) - --acpi: $(CLOBJ) -- $(CC) $(LDFLAGS) -o $@ $^ -+acpi-batt-status: $(CLOBJ) -+ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) - endif - - # build per-file dependencies - note that -MM may not be supported -@@ -62,10 +63,10 @@ - rm -f *.d $(targets) - - install: $(targets) -- install -d $(PREFIX)/bin/ -- install -pc $(targets) $(PREFIX)/bin/ -- install -d $(PREFIX)/man/man1/ -- install -pc $(doc_targets) $(PREFIX)/man/man1/ -+ install -d $(DESTDIR)$(PREFIX)/bin/ -+ install -pc $(targets) $(DESTDIR)$(PREFIX)/bin/ -+ install -d $(DESTDIR)$(MANDIR)/man1/ -+ install -p -m 0644 $(doc_targets) $(DESTDIR)$(MANDIR)/man1/ - - tags: - etags $(WMSRC) $(CLSRC) $(HEADERS) diff --git a/x11-plugins/wmacpi/wmacpi-1.34.ebuild b/x11-plugins/wmacpi/wmacpi-1.34.ebuild deleted file mode 100644 index 54fe653240d..00000000000 --- a/x11-plugins/wmacpi/wmacpi-1.34.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit eutils - -DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops" -HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/"; -SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc -sparc x86" -IUSE="acpi apm" - -DEPEND="<x11-libs/libdockapp-0.7" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - use apm && use acpi && eerror "APM and ACPI are in USE ... defaulting to ACPI" - use apm || use acpi || eerror "Neither APM or ACPI are in USE ... defaulting to ACPI" - if use acpi || ! use apm ; then - epatch "${FILESDIR}"/${PV}-acpi.patch - else - epatch "${FILESDIR}"/${PV}-apm.patch - fi -} - -src_compile() { - emake OPT="${CFLAGS}" || die "emake failed." -} - -src_install() { - dobin wmacpi || die "dobin failed." - dodoc AUTHORS ChangeLog README -} diff --git a/x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild b/x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild deleted file mode 100644 index f994beede5f..00000000000 --- a/x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit eutils toolchain-funcs - -DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops" -HOMEPAGE="http://himi.org/wmacpi/"; -MY_PV="${PV/_}" -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}/${MY_P}" -SRC_URI="http://himi.org/wmacpi/download/${MY_P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 -ppc -sparc x86" -IUSE="" - -DEPEND="<x11-libs/libdockapp-0.7 - x11-libs/libX11" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - # acpi and acpi.1 conflict with sys-power/acpi - Bug #60685 - mv acpi.c acpi-batt-status.c - mv acpi.1 acpi-batt-status.1 - epatch "${FILESDIR}"/${P}-makefile.patch -} - -src_compile() { - emake CC="$(tc-getCC)" OPT="${CFLAGS}" || die "compile failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - dodoc AUTHORS ChangeLog README TODO -} - -pkg_postinst() { - elog "The command-line utility are corresponding manpage are installed" - elog "as acpi-batt-status to prevent collisions with sys-power/acpi" -}
