summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2011-03-28 18:16:02 +0000
committerChristoph Mende <angelos@gentoo.org>2011-03-28 18:16:02 +0000
commit1980580117108d59cc3426f89b66b62faef1581c (patch)
tree70b27784733a18aa1503a4d5b5107e3344e6739d /net-misc
parentFix hardened test failure (#360185). (diff)
downloadgentoo-2-1980580117108d59cc3426f89b66b62faef1581c.tar.gz
gentoo-2-1980580117108d59cc3426f89b66b62faef1581c.tar.bz2
gentoo-2-1980580117108d59cc3426f89b66b62faef1581c.zip
Fixed slot deps and cleaned up
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/gip/ChangeLog7
-rw-r--r--net-misc/gip/gip-1.6.1.1.ebuild22
2 files changed, 15 insertions, 14 deletions
diff --git a/net-misc/gip/ChangeLog b/net-misc/gip/ChangeLog
index ece9efbe3c54..d722f8fc7dde 100644
--- a/net-misc/gip/ChangeLog
+++ b/net-misc/gip/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/gip
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gip/ChangeLog,v 1.19 2010/02/22 17:10:54 phajdan.jr Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gip/ChangeLog,v 1.20 2011/03/28 18:16:02 angelos Exp $
+
+ 28 Mar 2011; Christoph Mende <angelos@gentoo.org> gip-1.6.1.1.ebuild:
+ Fixed slot deps and cleaned up
22 Feb 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> gip-1.6.1.1.ebuild:
Use /usr/share/doc instead of /usr/doc for documentation wrt bug #255916
diff --git a/net-misc/gip/gip-1.6.1.1.ebuild b/net-misc/gip/gip-1.6.1.1.ebuild
index 9832c3350485..167663585d41 100644
--- a/net-misc/gip/gip-1.6.1.1.ebuild
+++ b/net-misc/gip/gip-1.6.1.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gip/gip-1.6.1.1.ebuild,v 1.10 2010/02/22 17:10:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gip/gip-1.6.1.1.ebuild,v 1.11 2011/03/28 18:16:02 angelos Exp $
+EAPI=3
inherit eutils versionator distutils
MY_P="${PN}-$(replace_version_separator 3 '-')"
@@ -14,34 +15,31 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
-RDEPEND=">=dev-cpp/gtkmm-2.4
- >=dev-libs/glib-2.2.3
- >=dev-libs/libsigc++-2.0"
-
+RDEPEND="dev-cpp/gtkmm:2.4
+ dev-libs/glib:2
+ dev-libs/libsigc++:2"
DEPEND="${RDEPEND}
dev-util/intltool
dev-util/pkgconfig"
S="${WORKDIR}/${MY_P}"
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
epatch "${FILESDIR}/${P}-libsigcpp.patch" \
"${FILESDIR}"/${P}-asneeded.patch
sed -i -e "s:g++:$(tc-getCXX):" installer/build_files.sh
+ sed -i -e 's@INST_PIXMAPDIR=\"$INST_PREFIX/lib/$EXECUTABLE\"@INST_PIXMAPDIR=\"/usr/lib/$EXECUTABLE\"@g' build.sh
+ sed -i -e 's@INST_PIXMAPDIR=\"/usr/lib/$EXECUTABLE\"@INST_PIXMAPDIR=\"$INST_PREFIX/lib/$EXECUTABLE\"@g' build.sh
+ sed -i -e 's@INST_DOCDIR=\"$INST_PREFIX/doc/$EXECUTABLE\"@INST_DOCDIR=\"$INST_PREFIX/share/doc/'${PF}'\"@g' build.sh
}
src_compile() {
- sed -i -e 's@INST_PIXMAPDIR=\"$INST_PREFIX/lib/$EXECUTABLE\"@INST_PIXMAPDIR=\"/usr/lib/$EXECUTABLE\"@g' build.sh
# Crazy build system...
./build.sh --prefix "${D}/usr" || die "./build failed"
}
src_install() {
dodoc AUTHORS CHANGELOG README
- sed -i -e 's@INST_PIXMAPDIR=\"/usr/lib/$EXECUTABLE\"@INST_PIXMAPDIR=\"$INST_PREFIX/lib/$EXECUTABLE\"@g' build.sh
- sed -i -e 's@INST_DOCDIR=\"$INST_PREFIX/doc/$EXECUTABLE\"@INST_DOCDIR=\"$INST_PREFIX/share/doc/'${PF}'\"@g' build.sh
# Crazy build system...
./build.sh --install --prefix "${D}/usr" || die "./build --install failed"
make_desktop_entry gip "GIP IP Address Calculator" gnome-calc3 Network