Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sys-fs/aufs3
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-10-18 17:25:14 +0000
committerJustin Lecher <jlec@gentoo.org>2012-10-18 17:25:14 +0000
commit9d64291fa003b22975d19d1ea567f9303a968c0f (patch)
tree16a23f1bd345a7035b0a41d3fb2b496e491e7fcc /sys-fs/aufs3
parentMake nss and metalink mutually exclusive, bug #433822 (diff)
downloadhistorical-9d64291fa003b22975d19d1ea567f9303a968c0f.tar.gz
historical-9d64291fa003b22975d19d1ea567f9303a968c0f.tar.bz2
historical-9d64291fa003b22975d19d1ea567f9303a968c0f.zip
sys-fs/aufs3: Merge changes related bugs 432346 432392 432398 into newest version
Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64 Manifest-Sign-Key: 0x70EB7916
Diffstat (limited to 'sys-fs/aufs3')
-rw-r--r--sys-fs/aufs3/ChangeLog6
-rw-r--r--sys-fs/aufs3/Manifest12
-rw-r--r--sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild10
-rw-r--r--sys-fs/aufs3/aufs3-3_p20121015.ebuild10
4 files changed, 21 insertions, 17 deletions
diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index fae8d32d6cac..33eb299a5934 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/aufs3
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.26 2012/10/15 05:22:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.27 2012/10/18 17:25:13 jlec Exp $
+
+ 18 Oct 2012; Justin Lecher <jlec@gentoo.org> aufs3-3_p20120813-r1.ebuild,
+ aufs3-3_p20121015.ebuild:
+ Merge changes related bugs 432346 432392 432398 into newest version
*aufs3-3_p20121015 (15 Oct 2012)
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index b6fca54d5c37..4b09ff92f4e5 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -35,16 +35,16 @@ EBUILD aufs3-3_p20120523.ebuild 4522 SHA256 f3aa201a2d0074106dbcf63bc09653205a21
EBUILD aufs3-3_p20120531.ebuild 4632 SHA256 f9ef7f6e4bf5660f7e875a38bbcc07db4ea304d5b80001db10882841749b2952 SHA512 e9dc26e647400ddceb3d6bc4df81699cfe56af8fcd992356db0af26fdaaffde2641db7bdcee2ebe5d6f6e39b50d73a9879fe177618704b6e52829c178d90554a WHIRLPOOL 904da73302decc4398844a01f2804cea22039b52a89190ad23faa532089d9333278eeb5c9c9d45860f8bc757af2184f78626462ef09f955e5b54d1b23879b646
EBUILD aufs3-3_p20120619.ebuild 4632 SHA256 1458e837811fbaa6aad77be59353df89e3b49a5b91cd4af4df57882f5a604010 SHA512 2259a1a7282cc584509388a0c0a8709562938513c37d1f858128aa3dd2078e7ca6737dfbbcdb31e8504e96cbfd573362aeb637e8dce1fc0144506e1878213559 WHIRLPOOL 513891aa0ed31fddc9525a301fded6aa36d76b0ec82201edba4bfad05caecb6a12e73e7b72f333e1968e16d369d45180d2d6232f9156c2d8804dbd5cb284eba7
EBUILD aufs3-3_p20120730.ebuild 4632 SHA256 3866934b24a6228d36c1a94caddc9e80d948a116af3f350436342501c1666855 SHA512 8af0e924679c2feb285b45471f27e9a121456e0a53d6193acf8dc2273b4de251cd1f527020a84799bdbb84989a27591e04444710e73435fb4b40ff4d3151835e WHIRLPOOL b2c251210a553241e14f0015f34e8ba9045860d8073acd4baeb0c8396a3d9c46016f2eaaa90ef8c6e431a6e2508bf40e51adaaf458aba8d62e59fd18b677d44d
-EBUILD aufs3-3_p20120813-r1.ebuild 4675 SHA256 52f90b55b82c666f1c18a243a62e69780693f54ba2a6154c94f950c46861b6fb SHA512 f15d517d0504b2198c85383fc828991dab9e0e66c3e15dbec5d83aa6d4b688176da32c0f8909b0bf14983e2023ceb6d856f8190f57caa2aaaca4ad03319c5105 WHIRLPOOL 721a1c986a6e2e05e31c19bdde467126452b513c386ee73687a8c8f8ae9e1d0b3eff8787b2a1eba309c02d15a91a6d2d7056967adeaccb0264ad40b24fb3b74e
+EBUILD aufs3-3_p20120813-r1.ebuild 4721 SHA256 5398a35d4b33224bd71394c5ffbc0b123061c0c17b0581c9dece5129e400769b SHA512 b922ef455b1708600e4301c92ac2d5d3ab4eac6559438e3a454a7cb717680d2f5f9a8094f974f8b524726800f78a0072ee08f9324e6947fcb9d6908a64a0f207 WHIRLPOOL 143a2b95cf9e93b9e20c17368194032e67e41b9bd1a45a6a3d9370811d6e40e5073b4e5cceb7d6bab4f8bf0b29e0d9766304348ef51c793dddec43ddef5bbb43
EBUILD aufs3-3_p20120813.ebuild 4682 SHA256 cde51eac99246bcb04cab124cf473f255309be56e692a439336f558756dca14f SHA512 f7380e08cf73f048a20391119f880d8a83d30e06a47a4c5e6fe90b0325205aeedf45906430afaa701e534544356348a9d4967d64b50a770115e807eb90dfd07e WHIRLPOOL 7d1ac2c48b67c1c4eec2a0abb3a54a10a4232e6fcca18eb84844a4c7cc5f7600c9c24173713a485038d2bddc37e4fa8715c33ec0499aa63e0f9c9af383998dd9
-EBUILD aufs3-3_p20121015.ebuild 4672 SHA256 4cfb6738cd2a22a6f97e48c13ce0e06767dff967d1e3a457da495e6f07772a4c SHA512 25ad1b97fbf4008200bbc9870cd4f5a262ff0b260fcb3e635658dfaad4659865e25b38b6bef167de6942aa8b649db77597e5bef72991b40dbde9a1d1bff5634b WHIRLPOOL eb465f99407780bfac38eaff1506d04afa1961359758b0c5edb00cfb6d9849aa4442ebc56db35b44ffd78d808bf101398e3c18797f217169349d00d5d8b2c036
-MISC ChangeLog 6308 SHA256 3fac9c982065a7f36a4c2123c824907200b65a7fc62f89bdd1fb66c6e87dbdf9 SHA512 e0ea29d60ddecae336f0eb8f3c913db240b05d3487ff53924cc83ac3499ab4a50ff12d936336edd539baf5d9a154cb023bf754c1cf4595cec480c98538da1f81 WHIRLPOOL 34cd90c4004a56186274cd0c8f900ab94be2e11133cf65f0dbe2257f13062bec44ec47c5857293e9294df12b1899c700a2f82e37197176d7f02522ca8f87f665
+EBUILD aufs3-3_p20121015.ebuild 4733 SHA256 a453d51d37590513323baac17f5211a54cd9cc5bbbb50561646029e1b66ad678 SHA512 d0496ed23182a22f062aadea3bf1b36d59b6db5cdc8bc65f8454d7f89be2faf495c56562dc86f6e38694c5d23b5e1873a23ae586a5aafb95df09d89fb7081363 WHIRLPOOL 9a6646229b92fe45e8074a46d3c08a0e7a089bde79c3dac33031fe3e3b846464a39522dc2505293a84743dbf42dd0fe165307285502ffaa68d82747fbe6b43ae
+MISC ChangeLog 6483 SHA256 c09c08802c19f76d61331fa5254a066e4c1ead65fb5e5780ffae8279f15bfb98 SHA512 21881a5ac973697151c5f60ce771895432a38e90cd439aafb7ced39aa58da96666991806b77b756a35a9d9990c5a4736a1aedff1fb47de49ef5c63e5fcb1bfc0 WHIRLPOOL 595e9014b71f922b5b2c253fe092cb6ed62743a3dea30f1a029485bfd82d5ecd3f75b9439e1204c7d3ddac2b4b7413786574014b12c4f2634c9871226975880f
MISC metadata.xml 758 SHA256 7107603a0759e5737aa5d9b674155f39b79695c4f582df4976b825be5e7b5536 SHA512 6dcf4ddf5616e78d0b43e54d08dbde64ddaa0ef995af863de3623c34bcab139c9e36329722a1f965821f6a2513a62906ad3a436f07368e25893704ea46dbf566 WHIRLPOOL 32198ee0cfa5cbd5fc12109e5136f84d0b240dabd7515a9fb0ef3617458372b063c51a60930309853526f297646e5a2afc3264f4a2e0e02383d970e5816c305f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: GPGTools - http://gpgtools.org
-iEYEAREIAAYFAlB7nbMACgkQgAnW8HDreRbg2ACdFr/FT6biPPBVvGbLZGwkVUu3
-+bgAniC9+PDWv9IDF/ZlPFgohztxq796
-=N1lB
+iEYEAREIAAYFAlCAO3oACgkQgAnW8HDreRaiyQCgr/BqJlZUlpozJGiVW1KRkKPk
+j8IAoLXol/dlNZxTifG9C+b/AsNys3gw
+=Hb4A
-----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild b/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild
index 26e389dad375..43dca39d7f78 100644
--- a/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild,v 1.2 2012/10/08 05:33:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild,v 1.3 2012/10/18 17:25:13 jlec Exp $
EAPI=4
-inherit linux-mod multilib toolchain-funcs eutils
+inherit eutils flag-o-matic linux-mod multilib toolchain-funcs
AUFS_VERSION="${PV%%_p*}"
# highest branch version
@@ -126,10 +126,10 @@ src_prepare() {
src_compile() {
local ARCH=x86
- emake CC=$(tc-getCC) ARCH=$(tc-arch-kernel) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
+ emake CC=$(tc-getCC) LDFLAGS="$(raw-ldflags)" ARCH=$(tc-arch-kernel) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
cd "${WORKDIR}"/${PN/3}-util
- emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
+ emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_OUT_DIR} C_INCLUDE_PATH="${S}"/include
}
src_install() {
@@ -142,7 +142,7 @@ src_install() {
dodoc Documentation/filesystems/aufs/README
cd "${WORKDIR}"/${PN/3}-util
- emake DESTDIR="${D}" KDIR=${KV_DIR} install
+ emake DESTDIR="${D}" KDIR=${KV_OUT_DIR} install
newdoc README README-utils
}
diff --git a/sys-fs/aufs3/aufs3-3_p20121015.ebuild b/sys-fs/aufs3/aufs3-3_p20121015.ebuild
index 1e61a27afdeb..6b4f622ceacc 100644
--- a/sys-fs/aufs3/aufs3-3_p20121015.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20121015.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20121015.ebuild,v 1.1 2012/10/15 05:22:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20121015.ebuild,v 1.2 2012/10/18 17:25:13 jlec Exp $
EAPI=4
-inherit linux-mod multilib toolchain-funcs eutils
+inherit eutils flag-o-matic linux-mod multilib toolchain-funcs
AUFS_VERSION="${PV%%_p*}"
# highest branch version
@@ -126,10 +126,10 @@ src_prepare() {
src_compile() {
local ARCH=x86
- emake CC=$(tc-getCC) ARCH=$(tc-arch-kernel) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
+ emake CC=$(tc-getCC) LD=$(tc-getLD) LDFLAGS="$(raw-ldflags)" ARCH=$(tc-arch-kernel) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
cd "${WORKDIR}"/${PN/3}-util
- emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
+ emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_OUT_DIR} C_INCLUDE_PATH="${S}"/include
}
src_install() {
@@ -142,7 +142,7 @@ src_install() {
dodoc Documentation/filesystems/aufs/README
cd "${WORKDIR}"/${PN/3}-util
- emake DESTDIR="${D}" KDIR=${KV_DIR} install
+ emake DESTDIR="${D}" KDIR=${KV_OUT_DIR} install
newdoc README README-utils
}