commit: 059f2642d046f0b1ac8022e97325d0e0b0f50060 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Thu Jul 26 03:56:59 2018 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Jul 26 03:57:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=059f2642
x11-plugins/wmxres: Simplify ebuild Package-Manager: Portage-2.3.43, Repoman-2.3.10 .../files/wmxres-1.2-r1-fix-build-system.patch | 23 ++++++++++++++++++++++ x11-plugins/wmxres/metadata.xml | 9 ++++----- x11-plugins/wmxres/wmxres-1.2-r1.ebuild | 16 ++++++--------- 3 files changed, 33 insertions(+), 15 deletions(-) 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 new file mode 100644 index 00000000000..53c791dc5e0 --- /dev/null +++ b/x11-plugins/wmxres/files/wmxres-1.2-r1-fix-build-system.patch @@ -0,0 +1,23 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,16 +1,15 @@ +-INCDIR = -I/usr/X11R6/include +-LIBDIR = -L/usr/X11R6/lib + LIBS = -lXpm -lXext -lX11 -lXxf86vm + OBJS = wmxres/wmxres.o \ +- wmgeneral/wmgeneral.o \ ++ wmgeneral/wmgeneral.o ++CFLAGS += -Wall + + .c.o: +- cc -g -c -O2 -Wall -D$(shell echo `uname -s`) $< -o $*.o $(INCDIR) ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -D$(shell echo `uname -s`) $< -o $@ + + all: wmxres + + wmxres: $(OBJS) +- cc -o wmxres/wmxres $^ $(LIBDIR) $(LIBS) ++ $(CC) $(LDFLAGS) -o wmxres/wmxres $^ $(LIBS) + + install:: all + install -s -m 4755 -o root wmxres/wmxres /usr/X11R6/bin diff --git a/x11-plugins/wmxres/metadata.xml b/x11-plugins/wmxres/metadata.xml index 1d5e6504004..7d273a80ff6 100644 --- a/x11-plugins/wmxres/metadata.xml +++ b/x11-plugins/wmxres/metadata.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer type="person"> - <email>[email protected]</email> - <name>Bernard Cafarelli</name> -</maintainer> - + <maintainer type="person"> + <email>[email protected]</email> + <name>Bernard Cafarelli</name> + </maintainer> </pkgmetadata> diff --git a/x11-plugins/wmxres/wmxres-1.2-r1.ebuild b/x11-plugins/wmxres/wmxres-1.2-r1.ebuild index a21121f7f82..cd415d8686c 100644 --- a/x11-plugins/wmxres/wmxres-1.2-r1.ebuild +++ b/x11-plugins/wmxres/wmxres-1.2-r1.ebuild @@ -22,17 +22,13 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${PN}.app" -PATCHES=( "${FILESDIR}"/${PN}-debian-1.1-1.2.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-debian-1.1-1.2.patch + "${FILESDIR}"/${PN}-1.2-r1-fix-build-system.patch +) -src_prepare() { - default - sed -e "s:-g -c -O2:${CFLAGS} -c:" \ - -e "s:\tcc :\t $(tc-getCC) \$(LDFLAGS) :g" \ - -i Makefile || die "sed failed" -} - -src_compile() { - emake INCDIR="-I${EPREFIX}/usr/include" LIBDIR="-L${EPREFIX}/usr/$(get_libdir)" +src_configure() { + tc-export CC } src_install() {
