summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-03-25 12:19:57 +0000
committerMichał Górny <mgorny@gentoo.org>2013-03-25 12:19:57 +0000
commit438e4cf8a96ded6fb8359badf3ce6d7b8bff4718 (patch)
treeaef51ef76c13acb9fda335bbf9d8b9c94b517262 /sys-apps
parentBump, bug #462370. Thanks to slepnoga. (diff)
downloadhistorical-438e4cf8a96ded6fb8359badf3ce6d7b8bff4718.tar.gz
historical-438e4cf8a96ded6fb8359badf3ce6d7b8bff4718.tar.bz2
historical-438e4cf8a96ded6fb8359badf3ce6d7b8bff4718.zip
Re-introduce patches fixing bug #461210. Drop useless "README" files.
Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64 Manifest-Sign-Key: 0x9627F456F9DA7643!
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/systemd/ChangeLog8
-rw-r--r--sys-apps/systemd/Manifest22
-rw-r--r--sys-apps/systemd/systemd-198-r5.ebuild (renamed from sys-apps/systemd/systemd-198-r4.ebuild)19
3 files changed, 42 insertions, 7 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index b95842fe3412..f14463ae35ce 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-apps/systemd
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.93 2013/03/24 22:12:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.94 2013/03/25 12:19:36 mgorny Exp $
+
+*systemd-198-r5 (25 Mar 2013)
+
+ 25 Mar 2013; Michał Górny <mgorny@gentoo.org> +systemd-198-r5.ebuild,
+ -systemd-198-r4.ebuild:
+ Re-introduce patches fixing bug #461210. Drop useless "README" files.
24 Mar 2013; Mike Gilbert <floppym@gentoo.org> systemd-198-r4.ebuild,
systemd-9999.ebuild:
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 619a52b7ab78..e42833422c94 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -15,14 +15,26 @@ DIST systemd-197.tar.xz 2054644 SHA256 e6857ea21ae24d7056e7b0f4c2aaaba73b8bf5702
DIST systemd-198.tar.xz 2140964 SHA256 444492355e5ff0ad99e0691ecaff1081ee8d45901580f47ba8b74e56107c71bf SHA512 29b07d934dbcda876feddf2b93c1f35f4bdceb0ba76dd18563e79da65a794b2450b283b6ec93b09828cc8fe918e007511f3bb2218fb0bcb3cb2fdbf940d3cf71 WHIRLPOOL 9e124534121086b666e285adff44778d03f42d52c13ef78281728882d79fa32fdd58e27c41d7f8402a62b20bff65fdf1a4a3ee4680c1327cf7895169c66c07c7
EBUILD systemd-197-r1.ebuild 6496 SHA256 0069c8127574ee382c55b790a3ef807c1db064057dc7ab9a24aec195e8907aa5 SHA512 ce8fdb78c5cce5e34474b12e29bed83814746949b676025e8780206ac716c1dab863be31f3d83db02de09be00a5ac26ebe70ca2474ea2e244f4903bbd5e6871a WHIRLPOOL 2f316c077c6fa23d02e12985131a915947aac265009094ff851d65cc403ca10aefbc8c3f3b6ced4ce6f9c551f52223ca01ec46545bc4b3cccd78633c04534dc1
EBUILD systemd-198-r1.ebuild 6869 SHA256 bd68d6866eed550d86f04c1f365caf2256fb9f552711073864833599a55eb632 SHA512 76394453ded9cdbf364f79c0e1426ee575b3ad88e38dc53661db0ae87b03fafaaae6720c3f231340995af4db73172515e5a0fd6c997ec42d70a4edb70041eb51 WHIRLPOOL a82174d69c02fcbb6ed5c262c6a58706181f047bb306a053500f5833d3819e272282a0bf5d88ca4116e719b8cb50fefaefe105570bd4f35e26ece1caf741fa72
-EBUILD systemd-198-r4.ebuild 6534 SHA256 9fc09b7a3978e884c5a9c9c50b820acd2a96093c149fd56f78438008e6faf6fc SHA512 e7f754b08f90d8f4bf1a34b3f55f1be1b4835f3384f6999743c6e757c9e320f1e020bb7246ca9396991fa5c006dd044c56db87f6d687642a7f1aa6155cec70b0 WHIRLPOOL f297ab4ff0ee7874407a3c74f3c7f4a3c23145ddca267c443eefdde14f5b6a92a199c448ef63c3d72e1ba725a3ae1371541428cdcc823e9b87122a7012389609
+EBUILD systemd-198-r5.ebuild 6982 SHA256 1167b5a26116f93495a71e7e54cb5fa81becb5412628c0c39c76a02a56a8a0d9 SHA512 d36c1fffb1877fca820e7e8a87ae6a24246107e90c5f7844696fe020046412753b75cc57fef38e76d22b27be7c05506e63254e7c24bea26e695502acc85e11db WHIRLPOOL bd61cbb4b4c06e2791c925fe1ab23906b9d686564a07e1055561fb32297d25d667190b94a6135127c4fa6454d5a90fe3ad481366414e40532cad217c1c96dfe4
EBUILD systemd-9999.ebuild 7130 SHA256 59cc75edfba4199855ee1cc3144bf962a2e7c3de354ad5764ad9aed88a83a72b SHA512 3ead722000404c561cc96099dc0fbecd4698f4ef0cc5b324aa017263de237431ce14ed4b7ad36fa9b1e3ea9426326a2ecb94c5028f160d28d6fc8f615cfe199a WHIRLPOOL 6806ff0762e29bbfe363ac3d8b8e07579a4534c6a7c2411683aa283c8d2a9adbd46a10838999bde88c822baa726cfdae3fd4a5bb2c6b6712a7712ac5550e2073
-MISC ChangeLog 18500 SHA256 0f6b87bbefe510c1f4c2c50232c0bc46a5649dc5115d70dcefe67042f75597e7 SHA512 875b43f0eeaf1b383a55e1deaf12af609754e3d006f32155372cb0feccf917f65b7f8dd13c915c6b51cd61d7343050e7d57ad0999b3b6d6e2e4b8b73bb616076 WHIRLPOOL f8160c0f16be03d01880a5765a695df24381411fd1615d23111dc7bd403bb9a996f2eeecbc0b1b31e7281b5c658dbd930276d548aee911c2913246163297889c
+MISC ChangeLog 18703 SHA256 9b1f4c09f6d6d174235cf7e7ae6dfae1c8afd39752b22effa0f6fa518811539b SHA512 ec357335a997cb65e655cf2b9411c93303dfeead5b4b64cd4a19d18e6b2f68be0460b4b0d1359531b325c454534004ddf8e0abeb4f848eecada2af6fd24e74c1 WHIRLPOOL 464facf62cde4832173d3dcce0367e00becbcc59ed5d504f68426458da5cde880e8244be9acf3d3f535e02565a4214d103ee08ceb60bd8d26b28db52fa7a1577
MISC metadata.xml 931 SHA256 62b80c12536efbf1d14d93155aa18e3af1011709efd96c66c0176300d6a468b3 SHA512 ca3eedc144f671828d3555820d4effaccd24e86dedb894fd173d044c08a4213166f2dfe6c58fb6b80cdfa79e5ab2a9a3918971b49b433947389580b75f77ad97 WHIRLPOOL fd5185112548fea3c9f3710e53e073366a2285b6e0e3d30a653db24b9e868cfb57f839ca90ffd9955e0d4b6d687e9946f01ef1f8dd3b724fd1b1197a0285bc1e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAlFPekwACgkQC77qH+pIQ6QeqgEAu0swD0xoVfGf0ybm/Ny4pUcQ
-NOg42CCb55ydugH1vKkA/jmGuoxuNvYVJFKPNh/mupnwV5cG87TJ+rF4ueETztRy
-=SpAr
+iQJ8BAEBCABmBQJRUEEjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDB2EQALnPtKLve39S4mdeObjNuBPS
+PCkKIcK1xvJbQAxjCQfBfTTjcF7m9MEt/Jwz2SowUVl0zaQ4+pdIm4CCz67FGLK7
+MFqGPWuWaJoFzAq9GB9LMONY0gLhrK7SjrJdyd9R7rMpIphAyNlBIKZMGF0uTMZO
+UaCAyXiVDFgt6/G0yLDkcussveseg09wBOF4AxYHDOXY/Gq9dmbfEy/dPx3Q/pqE
+NdZ+2HihrAQG66WrwqhoogjQ3wfECgkemz5kOZyX6WDIu9xiEezoN7lgb5IvfAFr
+qlvVYe6+cjT7Mdv8oEuFNzJ6gPqViSuiUo9TAmNxE2ZkAu8vvmqfw4Y3NAF2KOmx
+YYPKj8YQlQVku+55aRYi302qdY7b5Ja+BG6Fu2YSB4qyR4A7bXmLofF3neU4SrUl
+CykBVcw5R077RfPtXN/37IIzcJY0VmRfGVG859xaNc3L6XorVgXGb6Q+At6Y7ypd
+TFSmHouRkNJBJqb6I6w2RByV2pKydSVce+wwPEQ/EzTkKSuVS0fTP6KslJN0QKo4
+Rrl2OfUIq3A8Ot84xxTS8Q9kXE5lGtMyuO7bPyzAhl8q/IAugftxEnwtnr8z9isq
+vesuFThbY8yEW/7rhQXm+iD8oCbIMRaprKbVPXp8GkbIO5vVVUMqPW9J4KR2xFDg
+aKaa4yCfD2IwVUWGcy88
+=QU+k
-----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-198-r4.ebuild b/sys-apps/systemd/systemd-198-r5.ebuild
index b86afed16fff..9ba00e05dcdd 100644
--- a/sys-apps/systemd/systemd-198-r4.ebuild
+++ b/sys-apps/systemd/systemd-198-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-198-r4.ebuild,v 1.2 2013/03/24 22:12:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-198-r5.ebuild,v 1.1 2013/03/25 12:19:36 mgorny Exp $
EAPI=5
@@ -60,8 +60,22 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
doc? ( >=dev-util/gtk-doc-1.18 )"
+# eautomake
+DEPEND="${DEPEND}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-libs/gobject-introspection
+ >=dev-libs/libgcrypt-1.4.5
+ >=dev-util/gtk-doc-1.18"
+
src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}"/198-0002-build-sys-break-dependency-loop-between-libsystemd-i.patch
+ "${FILESDIR}"/198-0003-build-sys-link-libsystemd-login-also-against-libsyst.patch
+ )
autotools-utils_src_prepare
+
+ eautomake
}
src_configure() {
@@ -113,6 +127,9 @@ src_install() {
# remove pam.d plugin .la-file
prune_libtool_files --modules
+ # remove useless 'README' files
+ rm "${D}"/{etc/init.d,var/log}/README || die
+
# move nss_myhostname to rootfs (bug #460640)
dodir /$(get_libdir)
mv "${D}"/usr/$(get_libdir)/libnss_myhostname* "${D}"/$(get_libdir)/ \