| 1 |
commit: 059f2642d046f0b1ac8022e97325d0e0b0f50060 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 26 03:56:59 2018 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 26 03:57:44 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=059f2642 |
| 7 |
|
| 8 |
x11-plugins/wmxres: Simplify ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.43, Repoman-2.3.10 |
| 11 |
|
| 12 |
.../files/wmxres-1.2-r1-fix-build-system.patch | 23 ++++++++++++++++++++++ |
| 13 |
x11-plugins/wmxres/metadata.xml | 9 ++++----- |
| 14 |
x11-plugins/wmxres/wmxres-1.2-r1.ebuild | 16 ++++++--------- |
| 15 |
3 files changed, 33 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
diff --git a/x11-plugins/wmxres/files/wmxres-1.2-r1-fix-build-system.patch b/x11-plugins/wmxres/files/wmxres-1.2-r1-fix-build-system.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..53c791dc5e0 |
| 20 |
--- /dev/null |
| 21 |
+++ b/x11-plugins/wmxres/files/wmxres-1.2-r1-fix-build-system.patch |
| 22 |
@@ -0,0 +1,23 @@ |
| 23 |
+--- a/Makefile |
| 24 |
++++ b/Makefile |
| 25 |
+@@ -1,16 +1,15 @@ |
| 26 |
+-INCDIR = -I/usr/X11R6/include |
| 27 |
+-LIBDIR = -L/usr/X11R6/lib |
| 28 |
+ LIBS = -lXpm -lXext -lX11 -lXxf86vm |
| 29 |
+ OBJS = wmxres/wmxres.o \ |
| 30 |
+- wmgeneral/wmgeneral.o \ |
| 31 |
++ wmgeneral/wmgeneral.o |
| 32 |
++CFLAGS += -Wall |
| 33 |
+ |
| 34 |
+ .c.o: |
| 35 |
+- cc -g -c -O2 -Wall -D$(shell echo `uname -s`) $< -o $*.o $(INCDIR) |
| 36 |
++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -D$(shell echo `uname -s`) $< -o $@ |
| 37 |
+ |
| 38 |
+ all: wmxres |
| 39 |
+ |
| 40 |
+ wmxres: $(OBJS) |
| 41 |
+- cc -o wmxres/wmxres $^ $(LIBDIR) $(LIBS) |
| 42 |
++ $(CC) $(LDFLAGS) -o wmxres/wmxres $^ $(LIBS) |
| 43 |
+ |
| 44 |
+ install:: all |
| 45 |
+ install -s -m 4755 -o root wmxres/wmxres /usr/X11R6/bin |
| 46 |
|
| 47 |
diff --git a/x11-plugins/wmxres/metadata.xml b/x11-plugins/wmxres/metadata.xml |
| 48 |
index 1d5e6504004..7d273a80ff6 100644 |
| 49 |
--- a/x11-plugins/wmxres/metadata.xml |
| 50 |
+++ b/x11-plugins/wmxres/metadata.xml |
| 51 |
@@ -1,9 +1,8 @@ |
| 52 |
<?xml version="1.0" encoding="UTF-8"?> |
| 53 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 54 |
<pkgmetadata> |
| 55 |
-<maintainer type="person"> |
| 56 |
- <email>voyageur@g.o</email> |
| 57 |
- <name>Bernard Cafarelli</name> |
| 58 |
-</maintainer> |
| 59 |
- |
| 60 |
+ <maintainer type="person"> |
| 61 |
+ <email>voyageur@g.o</email> |
| 62 |
+ <name>Bernard Cafarelli</name> |
| 63 |
+ </maintainer> |
| 64 |
</pkgmetadata> |
| 65 |
|
| 66 |
diff --git a/x11-plugins/wmxres/wmxres-1.2-r1.ebuild b/x11-plugins/wmxres/wmxres-1.2-r1.ebuild |
| 67 |
index a21121f7f82..cd415d8686c 100644 |
| 68 |
--- a/x11-plugins/wmxres/wmxres-1.2-r1.ebuild |
| 69 |
+++ b/x11-plugins/wmxres/wmxres-1.2-r1.ebuild |
| 70 |
@@ -22,17 +22,13 @@ DEPEND="${RDEPEND} |
| 71 |
|
| 72 |
S="${WORKDIR}/${PN}.app" |
| 73 |
|
| 74 |
-PATCHES=( "${FILESDIR}"/${PN}-debian-1.1-1.2.patch ) |
| 75 |
+PATCHES=( |
| 76 |
+ "${FILESDIR}"/${PN}-debian-1.1-1.2.patch |
| 77 |
+ "${FILESDIR}"/${PN}-1.2-r1-fix-build-system.patch |
| 78 |
+) |
| 79 |
|
| 80 |
-src_prepare() { |
| 81 |
- default |
| 82 |
- sed -e "s:-g -c -O2:${CFLAGS} -c:" \ |
| 83 |
- -e "s:\tcc :\t $(tc-getCC) \$(LDFLAGS) :g" \ |
| 84 |
- -i Makefile || die "sed failed" |
| 85 |
-} |
| 86 |
- |
| 87 |
-src_compile() { |
| 88 |
- emake INCDIR="-I${EPREFIX}/usr/include" LIBDIR="-L${EPREFIX}/usr/$(get_libdir)" |
| 89 |
+src_configure() { |
| 90 |
+ tc-export CC |
| 91 |
} |
| 92 |
|
| 93 |
src_install() { |
Archives