summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-11-04 07:09:59 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-11-04 07:09:59 +0000
commite6e09f34f60368ace7b4eca9361b07ecfaecb973 (patch)
tree734d79288a95aff9258e9a47781a182c00959e9b
parentapp-misc/youtranslate: Adding ~amd64 keyword per user request. (diff)
downloadsunrise-e6e09f34f60368ace7b4eca9361b07ecfaecb973.tar.gz
sunrise-e6e09f34f60368ace7b4eca9361b07ecfaecb973.tar.bz2
sunrise-e6e09f34f60368ace7b4eca9361b07ecfaecb973.zip
emelfm2/files/emelfm2-gzip-manpage.patch: remove patch, add comments to the ebuild
svn path=/sunrise/; revision=1813
-rw-r--r--app-misc/emelfm2/ChangeLog4
-rw-r--r--app-misc/emelfm2/emelfm2-0.3.ebuild25
-rw-r--r--app-misc/emelfm2/files/emelfm2-gzip-manpage.patch20
3 files changed, 14 insertions, 35 deletions
diff --git a/app-misc/emelfm2/ChangeLog b/app-misc/emelfm2/ChangeLog
index 20ac46a8f..05e2b3c75 100644
--- a/app-misc/emelfm2/ChangeLog
+++ b/app-misc/emelfm2/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 04 Nov 2006; Stefan Schweizer <genstef@gentoo.org>
+ -files/emelfm2-gzip-manpage.patch, emelfm2-0.3.ebuild:
+ remove patch, add comments to the ebuild
+
04 Nov 2006; Uwe Helm (digitalenemy) <digitalenemy@gmail.com>
+files/emelfm2-gzip-manpage.patch, +emelfm2-0.3.ebuild, +metadata.xml:
New Ebuild for Bug 153611
diff --git a/app-misc/emelfm2/emelfm2-0.3.ebuild b/app-misc/emelfm2/emelfm2-0.3.ebuild
index b04539ce8..d3c4389dc 100644
--- a/app-misc/emelfm2/emelfm2-0.3.ebuild
+++ b/app-misc/emelfm2/emelfm2-0.3.ebuild
@@ -17,33 +17,28 @@ DEPEND=">=x11-libs/gtk+-2.6
fam? ( virtual/fam )"
RDEPEND=${DEPEND}
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/emelfm2-gzip-manpage.patch
-}
-
src_compile() {
local myconf
-
+
if use unicode; then
myconf="FILES_UTF8ONLY=1"
fi
-
+
if use fam; then
if has_version "app-admin/gamin"; then
myconf="${myconf} USE_GAMIN=1"
- else
+ else
myconf="${myconf} USE_FAM=1"
fi
else
myconf="${myconf} USE_FAM=0"
fi
-
+
+ # CC= looks bad with CFLAGS, instead the Makefile should be patched
emake \
- ICONDIR="/usr/share/pixmaps" \
- PREFIX="/usr" \
- CC="$(tc-getCC) ${CFLAGS}" \
+ ICONDIR="/usr/share/pixmaps" \
+ PREFIX="/usr" \
+ CC="$(tc-getCC) ${CFLAGS}" \
${myconf} || die "emake failed"
}
@@ -53,8 +48,8 @@ src_install() {
emake \
ICONDIR="${D}/usr/share/pixmaps" \
PREFIX="${D}/usr" \
- install || die "make install failed"
-
+ install || die "emake install failed"
+
prepalldocs
}
diff --git a/app-misc/emelfm2/files/emelfm2-gzip-manpage.patch b/app-misc/emelfm2/files/emelfm2-gzip-manpage.patch
deleted file mode 100644
index c1bbcf4da..000000000
--- a/app-misc/emelfm2/files/emelfm2-gzip-manpage.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.old 2006-10-31 23:05:42.000000000 +0100
-+++ Makefile 2006-10-31 23:06:59.000000000 +0100
-@@ -175,7 +175,7 @@
- done
- @install -d $(MAN_DIR)
- @install -m 644 docs/$(TARGET).1 $(MAN_DIR);
-- @bzip2 -f $(MAN_DIR)$(TARGET).1;
-+ @gzip -f $(MAN_DIR)$(TARGET).1;
-
- ifeq ($(XGD_INTEGRATION), 1)
- @install -d $(XGD_DESKTOP_DIR)
-@@ -199,7 +199,7 @@
- @rm -rf $(DOC_DIR)
- # @echo -e "\nif you like you can also delete the icon directory:\n\t$(ICON_DIR)\n"
- @rm -rf $(ICON_DIR)
-- @rm -f $(MAN_DIR)$(TARGET).1.bz2;
-+ @rm -f $(MAN_DIR)$(TARGET).1.gz;
-
- uninstall_plugins:
- @echo "uninstalling plugins from '$(PREFIX)'"