summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-Antoine Perennou <Marc-Antoine@Perennou.com>2011-04-13 20:26:34 +0200
committerMarc-Antoine Perennou <Marc-Antoine@Perennou.com>2011-04-13 20:26:34 +0200
commit410926ee59e3211921bf032826109e66fb70b6a1 (patch)
treef56ef60d6c35dffe5f8aacb5baecd9121d60133a /net-libs
parenttweak (diff)
downloadkeruspe-410926ee59e3211921bf032826109e66fb70b6a1.tar.gz
keruspe-410926ee59e3211921bf032826109e66fb70b6a1.tar.bz2
keruspe-410926ee59e3211921bf032826109e66fb70b6a1.zip
clean net-libs
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/libproxy/Manifest2
-rw-r--r--net-libs/libproxy/libproxy-0.4.6-r301.ebuild20
2 files changed, 9 insertions, 13 deletions
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index a9400c45..03f90606 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,4 +1,4 @@
AUX libproxy-0.4.6-mozjs-link_directory.patch 1365 RMD160 4ba7b7f923a8d48575db2f13c86482d78e54ae1c SHA1 0a083243f29571e5e971de6df6e4c81b9cf6444f SHA256 783bc34d685ddf3ba6e6c85003417412f2bb87e9fc87c4ca5c9c56bf5e99aea5
AUX libproxy-0.4.6-xulrunner-2.patch 4763 RMD160 66210bdb6497b14358fd73037b6e9813ffd55de3 SHA1 a0ee71fc9b6cd15176b53601655ee6c0d760651b SHA256 e4bd9cb3c43249593015c1fe2b6630e999627e01ca1091455a70ec32d0233525
-EBUILD libproxy-0.4.6-r301.ebuild 2262 RMD160 e045d679a45e3fc83b9dd473cf21f0bd6a1d780c SHA1 631eb944a990261742f579552f21bee9c852641a SHA256 a2877ce70cef179bfef55ee08c2d773cb423f7bc43f74de6c67ba9d3199f0713
+EBUILD libproxy-0.4.6-r301.ebuild 2269 RMD160 7cd09abab00c9b3fa1a68ddf31e2c0a83d433da0 SHA1 15ada7e99a3edd393a4efcf8229986869dcb4f9f SHA256 28c921fdfb896fe467cf8964c932959fb13d2c75522bc0d1891d3d334f3e8f72
DIST libproxy-0.4.6.tar.gz 82483 RMD160 f5f03c84ad2d87fe728869fadc669628737c639e SHA1 6e9745c87b774f34bf53f07a54284c0d72020e94 SHA256 9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30
diff --git a/net-libs/libproxy/libproxy-0.4.6-r301.ebuild b/net-libs/libproxy/libproxy-0.4.6-r301.ebuild
index e11ce74b..a96270be 100644
--- a/net-libs/libproxy/libproxy-0.4.6-r301.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.6-r301.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.6-r1.ebuild,v 1.4 2011/03/22 21:48:30 ssuominen Exp $
-EAPI="2"
+EAPI="3"
PYTHON_DEPEND="python? 2:2.5"
inherit cmake-utils eutils multilib python portability
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="gnome kde mono networkmanager perl python test vala webkit xulrunner"
+IUSE="gnome kde mono networkmanager perl python test vala xulrunner" #webkit
RDEPEND="
gnome? ( gnome-base/gconf:2 )
@@ -23,8 +23,9 @@ RDEPEND="
networkmanager? ( net-misc/networkmanager )
perl? ( dev-lang/perl )
vala? ( dev-lang/vala:0.12 )
- webkit? ( net-libs/webkit-gtk:2 )
xulrunner? ( >=net-libs/xulrunner-1.9.1:1.9 )"
+ # Disable till we figure out how to fix problems with gtk2/gtk3 apps
+ #webkit? ( net-libs/webkit-gtk:3 )
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.19"
@@ -33,8 +34,8 @@ DOCS="AUTHORS NEWS README ChangeLog"
PATCHES=(
"${FILESDIR}"/${P}-mozjs-link_directory.patch
- "${FILESDIR}"/${P}-xulrunner-2.patch
- )
+ "${FILESDIR}"/${P}-xulrunner-2.patch )
+ # "${FILESDIR}"/${P}-webkit-gtk-3.patch )
pkg_setup() {
if use python; then
@@ -47,6 +48,7 @@ src_configure() {
-DPERL_VENDORINSTALL=ON
-DCMAKE_C_FLAGS="${CFLAGS}"
-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+ -DWITH_WEBKIT=OFF
$(cmake-utils_use_with gnome GNOME)
$(cmake-utils_use_with kde KDE4)
$(cmake-utils_use_with mono DOTNET)
@@ -54,10 +56,10 @@ src_configure() {
$(cmake-utils_use_with perl PERL)
$(cmake-utils_use_with python PYTHON)
$(cmake-utils_use_with vala VALA)
- $(cmake-utils_use_with webkit WEBKIT)
$(cmake-utils_use_with xulrunner MOZJS)
$(cmake-utils_use test BUILD_TESTING)
)
+ #$(cmake-utils_use_with webkit WEBKIT)
cmake-utils_src_configure
}
@@ -67,13 +69,7 @@ src_compile() {
cmake-utils_src_compile
}
-pkg_preinst() {
- preserve_old_lib /usr/$(get_libdir)/libproxy.so.0
-}
-
pkg_postinst() {
- preserve_old_lib_notify /usr/$(get_libdir)/libproxy.so.0
-
if use python; then
python_need_rebuild
python_mod_optimize $(python_get_sitedir)/${PN}.py