diff options
| -rw-r--r-- | net-libs/neon/ChangeLog (renamed from media-plugins/neon/ChangeLog) | 0 | ||||
| -rw-r--r-- | net-libs/neon/Manifest (renamed from media-plugins/neon/Manifest) | 2 | ||||
| -rw-r--r-- | net-libs/neon/files/neon-0.29.6-doc.patch (renamed from media-plugins/neon/files/neon-0.29.6-doc.patch) | 0 | ||||
| -rw-r--r-- | net-libs/neon/files/neon-0.29.6-gnutls-3-backport.patch (renamed from media-plugins/neon/files/neon-0.29.6-gnutls-3-backport.patch) | 0 | ||||
| -rw-r--r-- | net-libs/neon/files/neon-0.29.6-gnutls-3-functions.patch (renamed from media-plugins/neon/files/neon-0.29.6-gnutls-3-functions.patch) | 0 | ||||
| -rw-r--r-- | net-libs/neon/files/neon-0.29.6-gnutls-3-types.patch (renamed from media-plugins/neon/files/neon-0.29.6-gnutls-3-types.patch) | 0 | ||||
| -rw-r--r-- | net-libs/neon/files/neon-0.29.6-no-ssl-check.patch (renamed from media-plugins/neon/files/neon-0.29.6-no-ssl-check.patch) | 0 | ||||
| -rw-r--r-- | net-libs/neon/metadata.xml (renamed from media-plugins/neon/metadata.xml) | 0 | ||||
| -rw-r--r-- | net-libs/neon/neon-0.30.0-r1.ebuild (renamed from media-plugins/neon/neon-0.30.0-r1.ebuild) | 59 |
9 files changed, 31 insertions, 30 deletions
diff --git a/media-plugins/neon/ChangeLog b/net-libs/neon/ChangeLog index bb048a9..bb048a9 100644 --- a/media-plugins/neon/ChangeLog +++ b/net-libs/neon/ChangeLog diff --git a/media-plugins/neon/Manifest b/net-libs/neon/Manifest index 2d16322..69c8cf7 100644 --- a/media-plugins/neon/Manifest +++ b/net-libs/neon/Manifest @@ -4,6 +4,6 @@ AUX neon-0.29.6-gnutls-3-functions.patch 4867 SHA256 3d1e50fe2fc79e92e42acbab179 AUX neon-0.29.6-gnutls-3-types.patch 1996 SHA256 1a2aabc6183abe942d5cf547a6f3dd2f28ba98b3e709f718527ba0d9c6969ae3 SHA512 7a139c36329f1125007184da4c50dbe50747486336835e67601033be82ed8ad0838d7af05f9737c8849c76cad0ec4494fffb8390062c268ae747a41a7ac7773d WHIRLPOOL b1432084f5726cfa8460876d99742366238e5d063b86088793d4d80945cd6b6a913a682c05204cab13bfffeabeaff81a9b0e552961811c4d07610a339c28cfa5 AUX neon-0.29.6-no-ssl-check.patch 834 SHA256 4377b91e901c61feb9ddecc0160cda6717fe24d6caeac8c912ec19a71565bd0e SHA512 36577a6da214e0b354ab646ec678b58d30a56680d8dad1a325025f844b487c58768778da4ac9f6e86e327f5b849c0cc538824672aff5eb611adb11631f03f4f5 WHIRLPOOL 973a2de0606ec2749d174b4dfb1e9ae615c4d3941d6e065e9c3c6df820d64245a8b239166770e187a3d7bac2e0d046edf27bfe938441f4c5e0a43c3aa30a4691 DIST neon-0.30.0.tar.gz 909989 SHA256 2962cfcb5d30f3272e3d2fa0e473434419770a3801afe3d46e5d1650787990c2 SHA512 67f8a6c5549c37d984d8a0af88cd93c8c51593fa995662fd686e47acb630143d7b0c02c09d3c19f6a0181e0ff82940618cf72a76f9cb17bb964293f4118f013e WHIRLPOOL 75df16aae54410e97887ad1b1d45a17e58868cffff7d929f511c4840179ace1500c33228b02de7a038b9620d729e5153e1e14cc916ed1af9ce90bf4c49fb4b71 -EBUILD neon-0.30.0-r1.ebuild 2418 SHA256 709b39a15353febcf5095b7cad0800f444f3763de30f05db22bd2bb9dcf7e5bd SHA512 ea1c10c77fa29e9ba9ac577bab13970424555a0f3265987995269450429e5983e1e6ab987e575eeab274cc498e45aae3ce6abec15383aa23b50a91c3558d26e4 WHIRLPOOL fddcfe799b71f1c5a91b233e66cf28bc7416b20ff0547af4071c027b2da3ac7f73300994f7d9d349ab27d8eed083dc15526905557963f4b6174192beba724e27 +EBUILD neon-0.30.0-r1.ebuild 2613 SHA256 272973cc08324a0f4b233ced18e18dbe1c8dc129520cce28d5ed50c56a1af690 SHA512 cd5406c3f187c047927cb6e06724b4da1c459db09e3147f0320b67b2504c8b068d04eb8d694f11d5180f386f6aaa4067be2c5f520f8e9932e0438ade5128b130 WHIRLPOOL f0cb0fc01d54ac500a8b5cd3e147af9e8c8560154f0d1b6ca4fcb6726fa194190edf00690db1e44e1f0778cfb705dfcf9d085f182d9878e21a1ac83a9e8fc1ed MISC ChangeLog 27543 SHA256 4bd3a25531711a2f4168061cb81c0308d351ee996a3f47822421069ae209a24b SHA512 37865e3a94ae705acf611024c2ba3ecab5d24144bd87057cd87025514651698893f2aa06cd5ab8c5bbe0354aeeaf6593661780d5e723d10c7feda5056b5a3e0c WHIRLPOOL 6bb84b5f962f72b769ab52b73545741d3f39cc2a24148ccd3f81c898963febc5a34426585af4de7dc809ce8ad20393b719b4b876a5bda0f9e77f68117c8ad2dd MISC metadata.xml 1221 SHA256 9c82ad6fe8e39c5dd55a026c64723e6e67c28b0332f8b4268b3043a0913b0b2c SHA512 fad08f7f145be6c765c130d276e653f2376c1fc78e4c2c51ccc6fd3b08b5694d3d03c82f69bab12e6a329b5a20ac8e261491675f0b44234181cdeb99d206166e WHIRLPOOL 223bc31e8bfc93882836a82d0f83ba8d59d75f61e73640515341daf05aa88d179f0e2c3988d621242f6dbaa6528d8d67f0e9c96f248e44f36df217f8d2df87c8 diff --git a/media-plugins/neon/files/neon-0.29.6-doc.patch b/net-libs/neon/files/neon-0.29.6-doc.patch index 194bb8e..194bb8e 100644 --- a/media-plugins/neon/files/neon-0.29.6-doc.patch +++ b/net-libs/neon/files/neon-0.29.6-doc.patch diff --git a/media-plugins/neon/files/neon-0.29.6-gnutls-3-backport.patch b/net-libs/neon/files/neon-0.29.6-gnutls-3-backport.patch index e699741..e699741 100644 --- a/media-plugins/neon/files/neon-0.29.6-gnutls-3-backport.patch +++ b/net-libs/neon/files/neon-0.29.6-gnutls-3-backport.patch diff --git a/media-plugins/neon/files/neon-0.29.6-gnutls-3-functions.patch b/net-libs/neon/files/neon-0.29.6-gnutls-3-functions.patch index 77fe932..77fe932 100644 --- a/media-plugins/neon/files/neon-0.29.6-gnutls-3-functions.patch +++ b/net-libs/neon/files/neon-0.29.6-gnutls-3-functions.patch diff --git a/media-plugins/neon/files/neon-0.29.6-gnutls-3-types.patch b/net-libs/neon/files/neon-0.29.6-gnutls-3-types.patch index 861207d..861207d 100644 --- a/media-plugins/neon/files/neon-0.29.6-gnutls-3-types.patch +++ b/net-libs/neon/files/neon-0.29.6-gnutls-3-types.patch diff --git a/media-plugins/neon/files/neon-0.29.6-no-ssl-check.patch b/net-libs/neon/files/neon-0.29.6-no-ssl-check.patch index a4b815a..a4b815a 100644 --- a/media-plugins/neon/files/neon-0.29.6-no-ssl-check.patch +++ b/net-libs/neon/files/neon-0.29.6-no-ssl-check.patch diff --git a/media-plugins/neon/metadata.xml b/net-libs/neon/metadata.xml index 25503b4..25503b4 100644 --- a/media-plugins/neon/metadata.xml +++ b/net-libs/neon/metadata.xml diff --git a/media-plugins/neon/neon-0.30.0-r1.ebuild b/net-libs/neon/neon-0.30.0-r1.ebuild index 820e766..0901507 100644 --- a/media-plugins/neon/neon-0.30.0-r1.ebuild +++ b/net-libs/neon/neon-0.30.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI="5" -inherit autotools libtool +inherit autotools-multilib libtool DESCRIPTION="HTTP and WebDAV client library" HOMEPAGE="http://www.webdav.org/neon/" @@ -12,7 +12,7 @@ SRC_URI="http://www.webdav.org/neon/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/27" -KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64" IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib" IUSE_LINGUAS="cs de fr ja nn pl ru tr zh_CN" for lingua in ${IUSE_LINGUAS}; do @@ -21,21 +21,21 @@ done unset lingua RESTRICT="test" -RDEPEND="expat? ( dev-libs/expat:0= ) - !expat? ( dev-libs/libxml2:2= ) +RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] ) + !expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) gnutls? ( app-misc/ca-certificates - net-libs/gnutls:0= - pkcs11? ( dev-libs/pakchois:0= ) + net-libs/gnutls:0=[${MULTILIB_USEDEP}] + pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) ) !gnutls? ( ssl? ( - dev-libs/openssl:0= - pkcs11? ( dev-libs/pakchois:0= ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] + pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] ) ) ) - kerberos? ( virtual/krb5:0= ) - libproxy? ( net-libs/libproxy:0= ) - nls? ( virtual/libintl:0= ) - zlib? ( sys-libs/zlib:0= )" + kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) + libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] ) + nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -46,32 +46,30 @@ src_prepare() { done sed -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${linguas}\"/" -i configure.in - AT_M4DIR="macros" eautoreconf - - elibtoolize + AUTOTOOLS_AUTORECONF=yes AT_M4DIR="macros" autotools-multilib_src_prepare } src_configure() { - local myconf=() + local myeconfargs=() if has_version sys-libs/glibc; then einfo "Enabling SSL library thread-safety using POSIX threads..." - myconf+=(--enable-threadsafe-ssl=posix) + myeconfargs+=(--enable-threadsafe-ssl=posix) fi if use expat; then - myconf+=(--with-expat) + myeconfargs+=(--with-expat) else - myconf+=(--with-libxml2) + myeconfargs+=(--with-libxml2) fi if use gnutls; then - myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt") + myeconfargs+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt") elif use ssl; then - myconf+=(--with-ssl=openssl) + myeconfargs+=(--with-ssl=openssl) fi - econf \ + autotools-multilib_src_configure \ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ --enable-shared \ $(use_with kerberos gssapi) \ @@ -79,18 +77,21 @@ src_configure() { $(use_enable nls) \ $(use_with pkcs11 pakchois) \ $(use_enable static-libs static) \ - $(use_with zlib) \ - "${myconf[@]}" + $(use_with zlib) } -src_install() { - emake DESTDIR="${D}" install-{config,headers,lib,man,nls} +AUTOTOOLS_PRUNE_LIBTOOL_FILES=all +DOC="AUTHORS BUGS NEWS README THANKS TODO" - find "${ED}" -name "*.la" -delete +ehook autotools-multilib-per-abi-pre_src_install my_abi_src_install +my_abi_src_install() { + emake DESTDIR="${D}" install-{config,headers,lib,man,nls} + return 1 +} +ehook autotools-multilib-best-abi-post_src_install my_best_abi_post_src_install +my_best_abi_post_src_install() { if use doc; then emake DESTDIR="${D}" install-html fi - - dodoc AUTHORS BUGS NEWS README THANKS TODO } |