gentoo resync : 19.11.2017

4 files changed, 2 insertions, 34 deletions

diff --git a/app-admin/cgmanager/Manifest b/app-admin/cgmanager/Manifest
index a55d86831f94..f6f0d33f8a3a 100644
--- a/app-admin/cgmanager/Manifest
+++ b/app-admin/cgmanager/Manifest
@@ -1,4 +1,3 @@
-AUX cgmanager-0.39-make-pam-conditional.patch 1068 SHA256 ed638b63b6e893a664378f7ab22083410225639c8bda431c283c8c728cd8b745 SHA512 d7673d3189af0279f9b34a94f8fd7631ab3dea68df5df11cdaaa541e4978ebeaae8d0fc91f9cf331853cd96dab6d9b284adb469d409fb58f5bda262bf96fbfa2 WHIRLPOOL 3f00abbf764411860250471fa418c1d5e30419e3f4e58f76f25aa54d91587713163fa7e5bfbe2d1b3ae89f29cd2fa8fda6f8a16e816b315739a53e504af61440
 AUX cgmanager.initd-r1 331 SHA256 f162685428a6593630daf5d636c198caf4992843ced977dc6d7288b7559a062c SHA512 f50afaf471f9e9d500cbc909da1185c1342481699eb1887f694ef91bd49c7cd727d21871ff5d6c0b6046601cfa72a4ac167926c62920b2f3a4902ec817401948 WHIRLPOOL 769e94196151bf11b9ca0ec5a190b85b47860e75d65a4bb13f624fd80794ad656b60d99cc6b28a56273b79d89431cd3c625ad3386d3c861f3bf252ec7b182d11
 AUX cgproxy.initd-r1 661 SHA256 97220fa0af6dcaa9d2cb726620ee3de8e216e55bab37cea40e5ed010ed637e35 SHA512 7f43ea6369428d71d122a191c6a1718987ed09eafe2217ae326606ddf2a50f0500d0de0520fe21e5d2edefb8ddd4c3a85623d2aac1212e821ea922cb8256fffc WHIRLPOOL 46931abeeb41bc572f195e0848d42d189df6e001b86b244c9dac5a9f1615f52491c81c3823b9d03ad97e13b4f3ec578174b84ecac5e31d2e95dfd3414cb64993
 DIST cgmanager-0.41.tar.gz 461805 SHA256 29b155befb3ac233d5d29dbca7c791c8138bab01bfa78ea4757ebb88ce23b458 SHA512 e8ba64665a21d987cd835580c2b6bafbcb05e22ce7f6216762d04840957c2cd21fb571360e0206ae9143656beed88ff3396eb1f644052c05189093a665a705fd WHIRLPOOL 4571c88415f24dbd3aae240e2427e27786538653602b4b6ba862eff1abd7fc8b2f97784ca5bced4481f738638030a5777f3d687ee5d115492d7a91ebf4985ab1
diff --git a/app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch b/app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch
deleted file mode 100644
index eed626f3e68c..000000000000
--- a/app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.am.old	2015-09-06 00:16:38.997836415 +0800
-+++ Makefile.am	2015-09-06 01:05:00.376009752 +0800
-@@ -133,6 +133,7 @@
- 	$(CCLD) -o tests/cgm-concurrent tests/cgm-concurrent.o \
- 		$(NIH_LIBS) $(NIH_DBUS_LIBS) $(DBUS_LIBS) -lpthread -lcgmanager
- 
-+if HAVE_PAMMODULE
- pam_LTLIBRARIES = pam_cgm.la
- pam_cgm_la_SOURCES = pam/pam_cgm.c pam/cgmanager.c pam/cgmanager.h
- pam_cgm_la_CFLAGS = $(AM_CFLAGS)
-@@ -145,4 +146,6 @@
- 	rm -f "$(DESTDIR)$(pamdir)/pam_cgm.a"
- uninstall-local:
- 	rm -f "$(DESTDIR)$(pamdir)/pam_cgm.so"
-+endif
-+
- tests: TESTS_CGM_CONCURRENT TESTS_SCM TEST_NSTEST
---- configure.ac.old	2015-09-06 00:55:48.262972928 +0800
-+++ configure.ac	2015-09-06 01:04:19.683301852 +0800
-@@ -127,6 +127,11 @@
- 
- AS_AC_EXPAND(SBINDIR, "$sbindir")
- 
-+AC_ARG_ENABLE(pam-module,
-+	[AS_HELP_STRING([--enable-pam-module],[build PAM module])],
-+	, enable_pam_module=no)
-+AM_CONDITIONAL([HAVE_PAMMODULE], [test "x$enable_pam_module" != "xno" ])
-+
- AC_ARG_WITH(
- 	[pamdir],
- 	[AS_HELP_STRING([--with-pamdir=PATH],[Specify the directory where PAM modules are stored])],
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 004fe5d0d9fb..28e561b42835 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -6,7 +6,7 @@ AUX conky-1.10.6-new_graph-oor.patch 1312 SHA256 09790582195c65df29b55e19e181823
 DIST conky-1.10.4.tar.gz 365145 SHA256 ed61ffb3be9fd24965d40401c7d54553e732038f3da2e03454915779384f59b4 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c WHIRLPOOL 6ca2a043dbc20aaff94bd0c05367b535cd71819543d76dd9a90b79417e2ebb0462c9203901f4e26e887bc249388ec041e0f76dcccf24a88fed9ce4bb532af558
 DIST conky-1.10.6.tar.gz 365669 SHA256 4c80982960b2a72e3e33cef33347c97b9239ed110d9584da4e7f17f28faf60ca SHA512 ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9 WHIRLPOOL 65a43baf0ec1b5e298a81a062d2aa511488026baf440a470eecc89d15aac010d0f89f86b60a16040ae1941fedbdb46f9aed82431a79f59b7f97439f148b9c5f5
 EBUILD conky-1.10.4.ebuild 4850 SHA256 4f1d8cf0ab5523ffd916a8471ffbee24575720585be684bd61690a54e336e275 SHA512 612694ed4db70e8198f6a5b4110f972ab09dff8e3f8619367db3e2697dce97d22fae09b971b3c7800b150f744e86a3268c0999f4e1f3ed3f3041bb32dbbb7663 WHIRLPOOL b706caf820c1905dc1a76e6e9c559b01d50365afa82b6bfbd7ce0c76a0df4590e0c094f72296ffed0ca88bef194bd1984ad4882a12f2f46bdbbcbceb22049ae1
-EBUILD conky-1.10.6-r4.ebuild 5068 SHA256 af9a4a6fb7da099d6c30527b496d53cc97783c2ebb1780aee84900d871dde1fe SHA512 32aac380a6093b2542c2d8b499450a0f51adbb96b3b05d00b0f13c1f62546f44ab9bf7669f59a3fd0858434c7b59d84692071df99b2a4bbe79666cb67025080b WHIRLPOOL c43cb73defaeae42649963d1e2ad34fa9684bf7f0ea12030d0b4d4b7fec07f8f86de26619526d9c309b8c9050ef287b1f99bc0722edd505b3d7ace004d9b2ce0
+EBUILD conky-1.10.6-r5.ebuild 5069 SHA256 389cace759cb20ba69384b083a185adbb5eb8db323fa043b2265bce956a7ea36 SHA512 20d3d03d30b45ac46d6b77482f3bd4ec03c077c4113361447f4b7191754363a62a89f96d874d12122190eb7b58ff95e33243f0c412d7377abd1de9b87f6ff8c9 WHIRLPOOL ebbc2e5a237a02f2b6111457029eaee5aa30ff38629be1e8d8eceb310f9cdaba2cc46de82376a79f9af61039e85a9254cbf66e4c1ef3cceb5f102e5caa285cd8
 MISC ChangeLog 8668 SHA256 3e1697a626614dcaecef4ac12727962b62fdf1c23a2021424f7a386a40729b38 SHA512 7f686cace9e9915e1772a7288f32b382ffa7170650271f3a967d816d0357f7156dac09c9996e104112d7b97b5764c7923a0bd2fa5ca1b86b9a5a474b6c9a9d22 WHIRLPOOL 3d40e13840be1cc68501c748a415028ab040114fe874387fc6d559a1908faf88e1083cc415a24d4d7797fda9a6366840e4b369285ee95642a32fa670a6e4d394
 MISC ChangeLog-2015 34218 SHA256 adc2023620bd75ca1fd201ebcda63137f7a678b63c5f6d609f5af34f383b4592 SHA512 c0ede6c537e264edf8308ac7bc115de278bd4aff510a061012d358c0c1776bb5f67d40d0600a4e92d91ea11ed0645535ebbcd0aa77fa125cfd6ece7ae0537b15 WHIRLPOOL 7648aeacb920d81f71bf8fed75c21ecca7cdb16511c4c18399a87b95dbc1eab510c84da5e1856f6a0bd6385d44b4746ba51b042fca6027fe3044447fe8420000
 MISC metadata.xml 2525 SHA256 65554345e355ca9ec2e72dd6c5169954ccf421ca3bce2385aec7909c384f000b SHA512 ccfe5718005f521aa00e7a66429493ea1301f7691acf0cca2faa5372c5f1349ba62d5046b85059f395fe51b30130a06f6867e0736b80cf4b76f9388b05fa76bb WHIRLPOOL b9081e8c70902af80147904eafc94bc2f626a1f580843c408b0dce613ac835af5b0bd5b79dfd330c15c67ccb444cceacb90698475c5ce9987c52223748d9092c
diff --git a/app-admin/conky/conky-1.10.6-r4.ebuild b/app-admin/conky/conky-1.10.6-r5.ebuild
index 0f6c02c40c02..214697b59d66 100644
--- a/app-admin/conky/conky-1.10.6-r4.ebuild
+++ b/app-admin/conky/conky-1.10.6-r5.ebuild
@@ -160,7 +160,7 @@ src_configure() {
 		-DBUILD_HTTP=$(usex webserver)
 		-DBUILD_WLAN=$(usex wifi)
 		-DBUILD_BUILTIN_CONFIG=ON
-		-DBUILD_OLD_CONFIG=ON
+		-DBUILD_OLD_CONFIG=OFF
 		-DBUILD_I18N=ON
 		-DMAINTAINER_MODE=ON
 		-DRELEASE=ON