diff options
Diffstat (limited to 'dev-db/unixODBC')
-rw-r--r-- | dev-db/unixODBC/ChangeLog | 7 | ||||
-rw-r--r-- | dev-db/unixODBC/Manifest | 4 | ||||
-rw-r--r-- | dev-db/unixODBC/unixODBC-2.3.2.ebuild | 40 |
3 files changed, 27 insertions, 24 deletions
diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog index d6bbd51a05cf..a45ffe5ee36d 100644 --- a/dev-db/unixODBC/ChangeLog +++ b/dev-db/unixODBC/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-db/unixODBC -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.115 2013/12/31 18:30:45 neurogeek Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.116 2014/05/25 02:58:07 neurogeek Exp $ + + 24 May 2014; <neurogeek@gentoo.org> unixODBC-2.3.2.ebuild: + Conversion to multilib. Bug #510868 *unixODBC-2.3.2 (31 Dec 2013) diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest index 02c5ded4fdea..6063f8e3e02b 100644 --- a/dev-db/unixODBC/Manifest +++ b/dev-db/unixODBC/Manifest @@ -5,6 +5,6 @@ DIST unixODBC-2.3.2.tar.gz 1849173 SHA256 9c3459742f25df5aa3c10a61429bde51a6d4f1 EBUILD unixODBC-2.3.0-r1.ebuild 1297 SHA256 c5a2db1a9cb329668b9a497ef7a54e5487b2213e0b80b9c0654cd4d14d8a506e SHA512 1f52e523fcf1bdf24f055d7c2a1ef9601a417c2545f19c630eb9bf60ab62c21ca476e7ae6da7f320921354ca49d6d7d641a54c17e8e664d32fd61f4cdbb836ec WHIRLPOOL d65e60eeab4708f61c401af8ab08f69008ce1829197583a893386f6fdcfc92775a663b527fd5d2942828dab1cfc20454de8949d9e51e8b50878e301264c7eb2b EBUILD unixODBC-2.3.1-r1.ebuild 1462 SHA256 0f15789da4aae3f925b4520707009d6e0d604813f7dd36e39980914909a7bfa0 SHA512 2477e50b14e05f8948b0ed8825d78ff400f53c53d881f35a8a38115325ef03ee598e033bfbde5add44eaebe32fcd304056e05b516b80bc8d29d7b1e4ed9b5c11 WHIRLPOOL abbc2ec8bd349f77c35a8ce1d244fa9977e2821b4b4c2f7fd9332ccdeaf99e1ef0a076da81208eaa9da35639a19be028a7b6c54302518777b60b4cf7faa02f66 EBUILD unixODBC-2.3.1.ebuild 1329 SHA256 98eae565504bcb607ed5baf73b80417a104a21a4a379da067e67242783109562 SHA512 e27caa3b16aa0cda18c0a34b8843187332aceefed9cb5b2f07ddca04633759d3651b9238a456049cbcedb1450df9001eed5992d0df336da01d635b772d0a21c3 WHIRLPOOL fc20adaaf1663803f12afb921755a9b2f66102e86c2b8afef37511394625f0479ad589dc1086887d6791fa5e6699e770fa783276703c9cf5cd49e11a585d1475 -EBUILD unixODBC-2.3.2.ebuild 1459 SHA256 08df204a7a3a31af6fd265a487f3eb64ac57c0dd6f2c3b462d2906f08de8ba17 SHA512 d6604bd2e02af4b6fb9148248b99639aee6c9cfdd8fefca3f66391eddc962b7c4f726419d1fa5f58fd050b5db038ef4359d09b63a5a78af02a8ea3130476632c WHIRLPOOL 0490569acde68e30658082ca2272bca9fd9f687ba9483e73c21e54f3d95d993bc2166a214b63c57b16c389b7a90ac37a882f04cc8304e6251bc648b155ac6329 -MISC ChangeLog 15672 SHA256 92195a71dde34961b16788effd3a15ceb8866d4b6dd491aa52a18c2408e11701 SHA512 4f5429b6bd7d4a0d594f6cb1d5c140fa3bb1530daa50ffc0145dd2d4e3ec41f0a05ac7b52848b3349998afaac351dc47c465cfdadb8320a9a7947ae40b138798 WHIRLPOOL 8bab8ca9db281c5f8a3b8da9d955f4028323595f624f40cf28f50c8a844722df774b66533c64b07f863e70d7bc1fc2c9a9e46457f17f2cb88304e48eab72dfba +EBUILD unixODBC-2.3.2.ebuild 1706 SHA256 93b82df4391033113835c40bc0ef9f2f0a0e23e9e85d20244eca8c99906bd302 SHA512 a11ccec654cb00a139b120793124e874af75aefcf0ebf2e830bc9964600ca679beb10713aef7a219cef231bec5a0af8df3adb5cfd4adaf0d754e7129ddbfe7c4 WHIRLPOOL ffce433fa22f8fe77f254c80811e6d19486fe581ee1f3f27a13ea50e50072c2a4a49a2779b32095024487ae5b6f7c002a76da1e15d33dff417152e3a2a3f15ce +MISC ChangeLog 15772 SHA256 3b0f6d7db26adf8e05dd8442d386bb7e376c857bc6760fcc72fa44cce7e410fd SHA512 da7005ce8177fdfebccd77b08114438e185172e4de4df29012fc4fc83853748004e118c51ce15677b1202ca874108e6efcc30f0a793d9d14474654daad415880 WHIRLPOOL 4a363046670ce4a52a3c654bf936aa1eb440de03890830ac04f41f8ba3f7fc2b6e5851eafa240fcb5b23114a2a79ec161dce33ddd446adc0c290c3c74d2e8d0f MISC metadata.xml 464 SHA256 f92aec6872caea5148968141b527a71a921e68eaf020845fcb3beb2d054d3864 SHA512 5a9f51c310e8e3a10efd804c73939e810428919444e25b7cfdc7630afaafa3292e0603dd751f83db603721470ef7d13b080c275519450f6ae0fc5ede80bdbec0 WHIRLPOOL e97638bd95b1162258e77ce1cfca6d3080d8f5aecc1b4f68aba35b111f8545f3e02b17966105f723c0eb95fc701839a342fe7868c9f9f5e3a8f9bdea42c2dda6 diff --git a/dev-db/unixODBC/unixODBC-2.3.2.ebuild b/dev-db/unixODBC/unixODBC-2.3.2.ebuild index c42a68c30bf2..23b84db1ef19 100644 --- a/dev-db/unixODBC/unixODBC-2.3.2.ebuild +++ b/dev-db/unixODBC/unixODBC-2.3.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.3.2.ebuild,v 1.1 2013/12/31 18:30:45 neurogeek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.3.2.ebuild,v 1.2 2014/05/25 02:58:07 neurogeek Exp $ EAPI=5 -inherit libtool +inherit libtool autotools-multilib eutils DESCRIPTION="A complete ODBC driver manager" HOMEPAGE="http://www.unixodbc.org/" @@ -14,33 +14,33 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+minimal odbcmanual static-libs unicode" -RDEPEND=">=sys-devel/libtool-2.2.6b - >=sys-libs/readline-6.1 - >=sys-libs/ncurses-5.7-r7 - virtual/libiconv" +RDEPEND=">=sys-devel/libtool-2.2.6b[${MULTILIB_USEDEP}] + >=sys-libs/readline-6.1[${MULTILIB_USEDEP}] + >=sys-libs/ncurses-5.7-r7[${MULTILIB_USEDEP}] + virtual/libiconv[${MULTILIB_USEDEP}] + abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )" DEPEND="${RDEPEND} sys-devel/flex" DOCS="AUTHORS ChangeLog NEWS README" - -src_prepare() { - elibtoolize -} +MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h ) src_configure() { # --enable-driver-conf is --enable-driverc as per configure.in - econf \ - --sysconfdir="${EPREFIX}"/etc/${PN} \ - --enable-iconv \ - $(use_enable static-libs static) \ - $(use_enable !minimal drivers) \ - $(use_enable !minimal driverc) \ - $(use_with unicode iconv-char-enc UTF8) \ + myeconfargs=( + --sysconfdir="${EPREFIX}"/etc/${PN} + --enable-iconv + $(use_enable static-libs static) + $(use_enable !minimal drivers) + $(use_enable !minimal driverc) + $(use_with unicode iconv-char-enc UTF8) $(use_with unicode iconv-ucode-enc UTF16LE) + ) + autotools-multilib_src_configure } -src_install() { - default +multilib_src_install_all() { + einstalldocs use prefix && dodoc README* use odbcmanual && dohtml -a css,gif,html,sql,vsd -r doc/* |